Skip to content

Commit 3ff5852

Browse files
Add explicit ContactPair type specification in ContactResult.jl
1 parent 2c77b44 commit 3ff5852

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/Composition/ResultElements/ContactResult.jl

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,18 @@ function evaluateResultElement(model::Modia.InstantiatedModel{F,TimeType}, scene
7474

7575
(contactPair, converse) = getElasticContactPair(scene, result.object1, result.object2)
7676
if !isnothing(contactPair)
77-
penetration = contactPair.results.penetration
78-
penetrationVelocity = contactPair.results.penetrationVelocity
79-
tangentialVelocity = contactPair.results.tangentialVelocity
80-
angularVelocity = contactPair.results.angularVelocity
81-
normalForce = contactPair.results.normalForce
82-
tangentialForce = contactPair.results.tangentialForce
83-
torque = contactPair.results.torque
84-
positionVector = contactPair.results.positionVector
85-
normalVector = contactPair.results.normalVector
86-
forceVector = contactPair.results.forceVector
87-
torqueVector = contactPair.results.torqueVector
77+
pair::ContactPair{F} = contactPair
78+
penetration = pair.results.penetration
79+
penetrationVelocity = pair.results.penetrationVelocity
80+
tangentialVelocity = pair.results.tangentialVelocity
81+
angularVelocity = pair.results.angularVelocity
82+
normalForce = pair.results.normalForce
83+
tangentialForce = pair.results.tangentialForce
84+
torque = pair.results.torque
85+
positionVector = pair.results.positionVector
86+
normalVector = pair.results.normalVector
87+
forceVector = pair.results.forceVector
88+
torqueVector = pair.results.torqueVector
8889
if converse
8990
normalVector = -normalVector
9091
forceVector = -forceVector

0 commit comments

Comments
 (0)