Merge pull request #570 from AnyBody/tweak_knee_simulator

Tweak knee simulator
AnyBody · Mar 29, 2021 · 0a247d2 · 0a247d2
2 parents 3fd949c + ae23cc9
commit 0a247d2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/Application/Examples/KneeSimulator/Model/Ligaments.any b/Application/Examples/KneeSimulator/Model/Ligaments.any
@@ -10,22 +10,22 @@ AnyFolder Ligaments = {
  };
 
   CREATE_LIGAMENT pPCL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = pPCL, WRAPPING = 0) = { NumStringMesh = 60; NumAugLagCoef=5000;};  
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = pPCL, WRAPPING = 0) = { NumStringMesh = 40;};  
 
   CREATE_LIGAMENT ALS (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = ALS, WRAPPING = 1 ) = { NumStringMesh = 100; PLine.InitWrapPosForEachStepOnOff=On;};  
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = ALS, WRAPPING = 1 ) = { NumStringMesh = 20; };  
 
   CREATE_LIGAMENT LCL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = LCL, WRAPPING = 0 ) = { NumStringMesh = 20; };
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = LCL, WRAPPING = 0 ) = { NumStringMesh = 40; };
 
   CREATE_LIGAMENT aMCL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = aMCL, WRAPPING = 1 ) = { NumStringMesh = 40; NumAugLagCoef=5000;};
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = aMCL, WRAPPING = 1 ) = { NumStringMesh = 20;};
 
   CREATE_LIGAMENT cMCL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = cMCL, WRAPPING = 1 ) = { NumStringMesh = 40; NumAugLagCoef=5000; };
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = cMCL, WRAPPING = 1 ) = { NumStringMesh = 20;};
 
   CREATE_LIGAMENT pMCL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = pMCL, WRAPPING = 1 ) = { NumStringMesh = 40; };  
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = pMCL, WRAPPING = 1 ) = { NumStringMesh = 20; };  
 
   CREATE_LIGAMENT aCM (
   ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = aCM, WRAPPING = 0 ) = { NumStringMesh = 30; }; 
@@ -46,20 +46,20 @@ AnyFolder Ligaments = {
   ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = PFL, WRAPPING = 0 ) = { NumStringMesh = 20;}; 
 
   CREATE_LIGAMENT sMPFL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = sMPFL, WRAPPING = 1 ) = { NumStringMesh = 30; };    
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = sMPFL, WRAPPING = 1 ) = { NumStringMesh = 20; };    
 
   CREATE_LIGAMENT mMPFL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = mMPFL, WRAPPING = 1 ) = { NumStringMesh = 30; };
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = mMPFL, WRAPPING = 1 ) = { NumStringMesh = 20; };
 
   CREATE_LIGAMENT iMPFL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = iMPFL, WRAPPING = 1) = { NumStringMesh = 30; };   
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = iMPFL, WRAPPING = 1) = { NumStringMesh = 20; };   
 
   CREATE_LIGAMENT sLPFL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = sLPFL, WRAPPING = 1) = { NumStringMesh = 30; };    
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = sLPFL, WRAPPING = 1) = { NumStringMesh = 20; };    
 
   CREATE_LIGAMENT mLPFL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = mLPFL, WRAPPING = 1) = { NumStringMesh = 30; };
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = mLPFL, WRAPPING = 1) = { NumStringMesh = 20; };
 
   CREATE_LIGAMENT iLPFL (
-  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = iLPFL, WRAPPING = 1) = { NumStringMesh = 30; };   
+  ParamFolder = Main.Parameters.Ligaments, LIGAMENT_NAME = iLPFL, WRAPPING = 1) = { NumStringMesh = 20; };   
 };
diff --git a/Application/Examples/KneeSimulator/UserDefinedSettings.any b/Application/Examples/KneeSimulator/UserDefinedSettings.any
@@ -24,11 +24,11 @@
 
 //Trial Specific Settings used in AnyOprSetForceDepKin (see manual for more information) 
 #ifndef FDK_ForceTol
-#define FDK_ForceTol 1e-3*100
+#define FDK_ForceTol 0.1
 #endif
 
 #ifndef FDK_MaxNewtonStep
-#define FDK_MaxNewtonStep 1e-2
+#define FDK_MaxNewtonStep 10e-3
 #endif
 
 #ifndef FDK_MaxIteration

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -34,6 +34,11 @@ AMMR 2.3.3 (2021-03-24)
   the muscles where not included correctly in the calibration study when using the three element 
   muscles model. 
 
+**Changed:**
+
+* The settings of the :ref:`Knee Simulator example <sphx_glr_auto_examples_Orthopedics_and_rehab_plot_KneeSimulator.py>` has been
+  tweaked to make it run faster. 
+
 **************************
 AMMR 2.3.2 (2021-01-21) 
 **************************