Skip to content

Commit dc4a558

Browse files
committed
Merge remote-tracking branch 'ammr-public/master' into ammr4-beta
2 parents 80e46e7 + b568282 commit dc4a558

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Application/Examples/KneeSimulator/Model/AnyKneeSimulator.any

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Main = {
1919

2020
AnyBodyStudy KneeSimulatorStudy = {
2121
// A low kinematic tolerance will help FDK optimization to converge
22-
Kinematics.KinematicTol = 1e-8;
22+
Kinematics.KinematicTol ??= 1e-8;
2323

2424
AnyFolder& Parameters = .Parameters;
2525
AnyFolder& Model = .Model;
@@ -46,8 +46,8 @@ Main = {
4646
InverseDynamics.ForceDepKin.LocalSearchMaxSteps ??= 15; // Reduced from default 25. Speeds up convergense.
4747

4848

49-
InverseDynamics.ForceDepKin.MaxNewtonStep = FDK_MaxNewtonStep;
50-
InverseDynamics.ForceDepKin.LocalSearchOnOff = FDK_LocalSearchOnOff;
49+
InverseDynamics.ForceDepKin.MaxNewtonStep ??= FDK_MaxNewtonStep;
50+
InverseDynamics.ForceDepKin.LocalSearchOnOff ??= FDK_LocalSearchOnOff;
5151

5252
#ifdef TOOLS_MODELUTILITIES_VIDEO_CAMERACLASSTEMPLATE
5353
// Include functions to generate a video:

Tests/Applications/test_KneeSimulator.any

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//pytest_markers=["slow"]
88
//# Ignore a specific a specific quirk in the model, where sigle time step was not converging
99
//# to the specified tolerance (AB#2486)
10-
//ignore_errors = ['Too many iterations used (final force error = 0.121916)']
10+
//ignore_errors = ['causes looping of Newton method (final force error = 0.']
1111
//save_study=[
1212
// "Main.KneeSimulatorStudy",
1313
//]

0 commit comments

Comments
 (0)