Changeset 1128 for branches/maintenance/2.2.2/Modelica/Mechanics/Translational.mo

Timestamp:

05/25/08 10:25:16 (6 months ago)

Author:

otter

Message:

maintenance/2.2.2/Modelica: Removed previously introduced fix for friction

Files:

• branches/maintenance/2.2.2/Modelica/Mechanics/Translational.mo (modified) (6 diffs)

branches/maintenance/2.2.2/Modelica/Mechanics/Translational.mo

@@ -1 @@
-within Modelica.Mechanics;
+within Modelica.Mechanics; 
 
 
@@ -302 +302 @@
       Translational.Spring S1(
         s_rel0=1,
-        c=1e3,
+        c=1e3, 
         s_rel(start=1, fixed=false)) 
                         annotation (extent=[-58, -20; -38, 0]);
@@ -308 +308 @@
       Translational.SpringDamper SD1(
         s_rel0=1,
-        c=111,
+        c=111, 
         s_rel(start=1, fixed=true)) 
                         annotation (extent=[20, -20; 40, 0]);
@@ -1526 +1526 @@
 </ul>
 </html>"));
-    protected 
+protected
       constant SI.Acceleration unitAcceleration = 1;
       constant SI.Force unitForce = 1;
-      Real sa0 = (f0_max + (f0_max - f0))/unitForce 
-        "Value of sa when start of forward sliding at w=0";
     equation 
       /* Friction characteristic
@@ -1538 +1536 @@
   */
       
-      startForward = pre(mode) == Stuck and sa > f0_max/unitForce and s < (smax - L/2) or 
-                     pre(mode) == Backward and v_relfric > v_small or initial() and (v_relfric > 0);
-      startBackward = pre(mode) == Stuck and sa < -f0_max/unitForce and s > (smin + L/2) or 
-                      pre(mode) == Forward and v_relfric < -v_small or initial() and (v_relfric < 0);
+      startForward = pre(mode) == Stuck and (sa > f0_max/unitForce and s < (smax - L/2) or 
+            pre(startForward) and sa > f0/unitForce and s < (smax - L/2)) or pre(mode)
+         == Backward and v_relfric > v_small or initial() and (v_relfric > 0);
+      startBackward = pre(mode) == Stuck and (sa < -f0_max/unitForce and s > (smin + L/2) or 
+            pre(startBackward) and sa < -f0/unitForce and s > (smin + L/2)) or pre(mode)
+         == Forward and v_relfric < -v_small or initial() and (v_relfric < 0);
       
       locked = not free and not (pre(mode) == Forward or startForward or pre(
@@ -1547 +1547 @@
       
       a_relfric = unitAcceleration*(if locked then 0 else if free then sa else if startForward then 
-              sa - sa0 else if startBackward then sa + sa0 else if pre(mode) == Forward then sa - sa0 else sa + sa0);
+              sa - f0/unitForce else if startBackward then sa + f0/unitForce else if pre(mode) ==
+        Forward then sa - f0/unitForce else sa + f0/unitForce);
       
       /* Friction torque has to be defined in a subclass. Example for a clutch: