Skip to content

Commit 2ccdd94

Browse files
committed
rename mprTolerance
1 parent 9181135 commit 2ccdd94

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

src/Composition/scene.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ Defines global properties of the system, such as the gravity field. Exactly one
308308
| `gravityField` | [`UniformGravityField`](@ref)`()` |
309309
| `useOptimizedStructure` | true |
310310
| `enableContactDetection` | true |
311-
| `mpr_tol_rel` | 1.0e-20 |
311+
| `mprTolerance` | 1.0e-20 |
312312
| `elasticContactReductionFactor` | 1.0 |
313313
| `enableVisualization` | true |
314314
| `animationFile` | nothing |
@@ -338,7 +338,7 @@ Defines global properties of the system, such as the gravity field. Exactly one
338338
339339
- `enableContactDetection::Bool`: = true, if contact detection is enable, see [Collision Handling](@ref).
340340
341-
- `mpr_tol_rel::1.0e-20`: Local tolerance used for terminating the mpr algorithm. Changing this value might improve speed.
341+
- `mprTolerance::1.0e-20`: Local tolerance used for terminating the mpr algorithm. Changing this value might improve speed.
342342
343343
- `elasticContactReductionFactor::Float64`: (> 0.0)
344344
- ``usedContactCompliance = contactCompliance * elasticContactReductionFactor``
@@ -421,7 +421,7 @@ mutable struct Scene <: Modia3D.AbstractScene
421421
function Scene(;gravityField = UniformGravityField(),
422422
useOptimizedStructure = true,
423423
enableContactDetection = true,
424-
mpr_tol_rel = 1.0e-20,
424+
mprTolerance = 1.0e-20,
425425
elasticContactReductionFactor = 1.0,
426426
gap = 0.001,
427427
enableVisualization = true,
@@ -443,7 +443,7 @@ mutable struct Scene <: Modia3D.AbstractScene
443443

444444
sceneOptions = SceneOptions(gravityField = gravityField,
445445
useOptimizedStructure = useOptimizedStructure,
446-
contactDetection = ContactDetectionMPR_handler(tol_rel = mpr_tol_rel),
446+
contactDetection = ContactDetectionMPR_handler(tol_rel = mprTolerance),
447447
nVisualContSupPoints = nVisualContSupPoints,
448448
gap = gap,
449449
enableContactDetection = enableContactDetection,

test/Collision/Billard16Balls.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Ball = Model(
8686
)
8787

8888
Billard = Model(
89-
world = Object3D(feature=Scene(gravityField=UniformGravityField(g=9.81, n=[0, 0, -1]), mpr_tol_rel = 1.0e-18,
89+
world = Object3D(feature=Scene(gravityField=UniformGravityField(g=9.81, n=[0, 0, -1]), mprTolerance = 1.0e-18,
9090
enableContactDetection=true,
9191
nominalLength=0.15*TableX)), # animationFile="Billard16Balls.json"
9292
table = Table,

test/Collision/CollidingSphereWithBunnies.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ massAndGeoSphere = MassPropertiesFromShape()
1414
# Objects3D
1515
ConvexPartitions = Model(
1616
gravField = UniformGravityField(g=9.81, n=[0, -1, 0]),
17-
world = Object3D(feature=Scene(gravityField=:gravField, mpr_tol_rel = 1.0e-13)),
17+
world = Object3D(feature=Scene(gravityField=:gravField, mprTolerance = 1.0e-13)),
1818

1919
sphere = Object3D(feature=Solid(shape=Sphere(diameter=0.2),
2020
visualMaterial=mat1, solidMaterial="Steel",

test/Collision/TwoCollidingBoxes.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ vmat2 = Modia3D.VisualMaterial(color="Red" , transparency=0.6)
99
cmat = "Steel"
1010

1111
collidingBoxes = Model(
12-
world = Object3D(feature=Scene(gravityField=UniformGravityField(g=9.81, n=[-1, 0, 0]), mpr_tol_rel = 1.0e-9,
12+
world = Object3D(feature=Scene(gravityField=UniformGravityField(g=9.81, n=[-1, 0, 0]), mprTolerance = 1.0e-9,
1313
enableContactDetection=true)),
1414

1515
fixedBox = Object3D(parent=:world,

test/Robot/YouBotGripping.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ YouBot = Model(
488488

489489
Scenario = Model(
490490
gravField = UniformGravityField(g=9.81, n=[0,0,-1]),
491-
world = Object3D(feature=Scene(gravityField=:gravField,mpr_tol_rel = 1.0e-13, visualizeFrames=false, nominalLength=tableX,
491+
world = Object3D(feature=Scene(gravityField=:gravField,mprTolerance = 1.0e-13, visualizeFrames=false, nominalLength=tableX,
492492
animationFile="YouBotGripping.json",
493493
enableContactDetection=true, elasticContactReductionFactor=1e-3)),
494494
# worldFrame = Object3D(parent=:world, feature=Visual(shape=CoordinateSystem(length=0.2))),

test/Robot/YouBotWithSphere.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ Gripper = Model(
357357

358358
YouBot = Model(
359359
gravField = UniformGravityField(g=9.81, n=[0,0,-1]),
360-
world = Object3D(feature=Scene(gravityField = :gravField, mpr_tol_rel=1.0e-18,
360+
world = Object3D(feature=Scene(gravityField = :gravField, mprTolerance=1.0e-18,
361361
visualizeFrames=false, defaultFrameLength=0.1,
362362
enableContactDetection=true, elasticContactReductionFactor=1e-4)),
363363
base = Base,

0 commit comments

Comments
 (0)