Merge remote-tracking branch 'ammr-public/master' into ammr4-beta

Author: melund

Application/Examples/KneeSimulator/Model/AnyKneeSimulator.any

@@ -19,7 +19,7 @@ Main = {
 
   AnyBodyStudy KneeSimulatorStudy = {
     // A low kinematic tolerance will help FDK optimization to converge
-    Kinematics.KinematicTol = 1e-8;
+    Kinematics.KinematicTol ??= 1e-8;
 
     AnyFolder& Parameters = .Parameters; 
     AnyFolder& Model = .Model;
@@ -46,8 +46,8 @@ Main = {
     InverseDynamics.ForceDepKin.LocalSearchMaxSteps ??= 15; // Reduced from default 25. Speeds up convergense.
 
 
-    InverseDynamics.ForceDepKin.MaxNewtonStep = FDK_MaxNewtonStep;       
-    InverseDynamics.ForceDepKin.LocalSearchOnOff = FDK_LocalSearchOnOff;  
+    InverseDynamics.ForceDepKin.MaxNewtonStep ??= FDK_MaxNewtonStep;       
+    InverseDynamics.ForceDepKin.LocalSearchOnOff ??= FDK_LocalSearchOnOff;  
 
     #ifdef TOOLS_MODELUTILITIES_VIDEO_CAMERACLASSTEMPLATE
     // Include functions to generate a video:

Tests/Applications/test_KneeSimulator.any

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