Fix force law function check in Bushing

Author: GerhardHippmann

src/Composition/ForceElements/Bushing.jl

@@ -75,10 +75,10 @@ mutable struct Bushing <: Modia3D.AbstractForceElement
                        rotDamperForceLaw::AbstractVector = Modia3D.ZeroVector3D,
                        largeAngles::Bool = false )
         for dir in 1:3
-            @assert(typeof(springForceLaw[dir]) == Float64 || typeof(springForceLaw[dir]) == Function)
-            @assert(typeof(damperForceLaw[dir]) == Float64 || typeof(damperForceLaw[dir]) == Function)
-            @assert(typeof(rotSpringForceLaw[dir]) == Float64 || typeof(rotSpringForceLaw[dir]) == Function)
-            @assert(typeof(rotDamperForceLaw[dir]) == Float64 || typeof(rotDamperForceLaw[dir]) == Function)
+            @assert(typeof(springForceLaw[dir]) == Float64 || isa(springForceLaw[dir], Function))
+            @assert(typeof(damperForceLaw[dir]) == Float64 || isa(damperForceLaw[dir], Function))
+            @assert(typeof(rotSpringForceLaw[dir]) == Float64 || isa(rotSpringForceLaw[dir], Function))
+            @assert(typeof(rotDamperForceLaw[dir]) == Float64 || isa(rotDamperForceLaw[dir], Function))
         end
 
         nomForce  = Modia3D.convertAndStripUnit(SVector{3,Float64}, u"N"  , nominalForce)

test/ForceElements/BoxBushing.jl

@@ -11,6 +11,10 @@ if largeAngles
 else
     startAngles = [0.12, 0.06, 0.03]
 end
+fc(p) = 50.0 * p
+fd(v) = 2.0 * v
+mc(a) = 20.0 * a
+md(w) = 0.2 * w
 
 BoxBushing = Model(
     Length = 0.1,
@@ -25,8 +29,8 @@ BoxBushing = Model(
                                  visualMaterial=:(visualMaterial))),
     joint = FreeMotion(obj1=:world, obj2=:box, r=Var(init=[0.2, 0.1, 0.05]), rot=Var(init=startAngles)),
     force = Bushing(obj1=:world, obj2=:box,
-                    springForceLaw=[50.0, 100.0, 200.0], damperForceLaw=[1.0, 2.0, 4.0],
-                    rotSpringForceLaw=[5.0, 10.0, 20.0], rotDamperForceLaw=[0.1, 0.2, 0.4], largeAngles=largeAngles)
+                    springForceLaw=[fc, 100.0, 200.0], damperForceLaw=[1.0, fd, 4.0],
+                    rotSpringForceLaw=[5.0, 10.0, mc], rotDamperForceLaw=[0.1, md, 0.4], largeAngles=largeAngles)
 )
 
 boxBushing = @instantiateModel(buildModia3D(BoxBushing), aliasReduction=false, unitless=true)