Changeset 660 for Modelica/branches/maintenance/2.2.2/Modelica/Mechanics/Rotational.mo

Timestamp:

10/10/2007 03:17:26 PM (15 months ago)

Author:

otter

Message:

Fixed minor unit errors reported by Sven Erik
(mostly related to s-parameterization of ideal electrical
switches and friction elements)

Files:

• Modelica/branches/maintenance/2.2.2/Modelica/Mechanics/Rotational.mo (modified) (7 diffs)

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

@@ -3210 +3210 @@
     
     // Friction torque
-    tau = if locked then sa else (if startForward then 
+    tau = if locked then sa*unitTorque else (if startForward then 
       Modelica.Math.tempInterpol1(w, tau_pos, 2) else if startBackward then -
       Modelica.Math.tempInterpol1(-w, tau_pos, 2) else if pre(mode) == Forward then 
@@ -3411 +3411 @@
     
     // friction torque
-    tau = if locked then sa else if free then 0 else cgeo*fn*(if startForward then 
+    tau = if locked then sa*unitTorque else if free then 0 else cgeo*fn*(if startForward then 
             Modelica.Math.tempInterpol1(w_rel, mue_pos, 2) else if 
       startBackward then -Modelica.Math.tempInterpol1(-w_rel, mue_pos, 2) else 
@@ -3448 +3448 @@
     Real mue0 "Friction coefficient for w=0 and sliding";
     Boolean free "true, if frictional element is not active";
-    Real sa "path parameter of tau = f(a_rel) Friction characteristic";
+    Real sa(unit="1") 
+      "path parameter of tau = f(a_rel) Friction characteristic";
     constant Real eps0=1.0e-4 "Relative hysteresis epsilon";
     SI.Torque tau0_max_low "lowest value for tau0_max";
@@ -3629 +3630 @@
        special code shall be generated)
     */
-    startForward = pre(stuck) and (sa > tau0_max or pre(startForward) and sa >
-      tau0 or w_rel > w_small) or initial() and (w_rel > 0);
+    startForward = pre(stuck) and (sa > tau0_max/unitTorque or pre(startForward) and sa >
+      tau0/unitTorque or w_rel > w_small) or initial() and (w_rel > 0);
     locked = pre(stuck) and not startForward;
     
     // acceleration and friction torque
     a_rel = unitAngularAcceleration* (if locked then 0 else sa - tau0/unitTorque);
-    tau = if locked then sa else (if free then 0 else cgeo*fn*
+    tau = if locked then sa*unitTorque else (if free then 0 else cgeo*fn*
       Modelica.Math.tempInterpol1(w_rel, mue_pos, 2));
     
@@ -3852 +3853 @@
     
     // friction torque
-    tau = if locked then sa else if free then 0 else cgeo*fn*(if startForward then 
+    tau = if locked then sa*unitTorque else if free then 0 else cgeo*fn*(if startForward then 
             Modelica.Math.tempInterpol1(w, mue_pos, 2) else if startBackward then 
             -Modelica.Math.tempInterpol1(-w, mue_pos, 2) else if pre(mode) ==
@@ -4190 +4191 @@
     
     // Determine rolling/stuck mode when w_rel = 0
-    startForward = pre(mode) == Stuck and sa > tauLossMax or initial() and w_a
+    startForward = pre(mode) == Stuck and sa > tauLossMax/unitTorque or initial() and w_a
        > 0;
-    startBackward = pre(mode) == Stuck and sa < tauLossMin or initial() and w_a
+    startBackward = pre(mode) == Stuck and sa < tauLossMin/unitTorque or initial() and w_a
        < 0;
     locked = not (ideal or pre(mode) == Forward or startForward or pre(mode)
@@ -4201 +4202 @@
        to simplify the following expression as mode == Stuck is assured in case
        of startForward or startBackward */
-    tauLoss = if ideal then 0 else (if locked then sa else (if (startForward or 
+    tauLoss = if ideal then 0 else (if locked then sa*unitTorque else (if (startForward or 
           pre(mode) == Forward) then tauLossMax else tauLossMin));