Implement improvement suggested by @tobolar

m-kormann · Oct 20, 2023 · ca9dd13 · ca9dd13
1 parent 5ea6660
commit ca9dd13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Modelica/Mechanics/Rotational/Interfaces/PartialFriction.mo b/Modelica/Mechanics/Rotational/Interfaces/PartialFriction.mo
@@ -54,9 +54,9 @@ equation
     mode) == Backward or startBackward);
 
   a_relfric/unitAngularAcceleration = if locked then 0 else if free then sa
-     else if startForward then sa - tau0_max/unitTorque else if
-    startBackward then sa + tau0_max/unitTorque else if pre(mode) ==
-    Forward then sa - tau0_max/unitTorque else sa - sign(w_relfric)*tau0_max/unitTorque;
+    else if startForward then sa - tau0_max/unitTorque
+    else if startBackward then sa + tau0_max/unitTorque
+    else sa - sign(w_relfric)*tau0_max/unitTorque;
 
   /* Friction torque "tau" has to be defined in a subclass. Example for possible
      realization of a clutch utilizing interpolation by ExternalCombiTable1D see:

diff --git a/Modelica/Mechanics/Translational/Interfaces/PartialFriction.mo b/Modelica/Mechanics/Translational/Interfaces/PartialFriction.mo
@@ -51,10 +51,10 @@ equation
   locked = not free and not (pre(mode) == Forward or startForward or pre(
     mode) == Backward or startBackward);
 
-  a_relfric/unitAcceleration = if locked then 0 else if free then sa else
-    if startForward then sa - f0_max/unitForce else if startBackward then
-    sa + f0_max/unitForce else if pre(mode) == Forward then sa - f0_max/
-    unitForce else sa - sign(v_relfric)*f0_max/unitForce;
+  a_relfric/unitAcceleration = if locked then 0 else if free then sa
+    else if startForward then sa - f0_max/unitForce
+    else if startBackward then sa + f0_max/unitForce
+    else sa - sign(v_relfric)*f0_max/unitForce;
 
   /* Friction force "f" has to be defined in a subclass. Example for possible
      realization of a brake utilizing interpolation by ExternalCombiTable1D see: