Changeset 768 for branches/maintenance/2.2.2

Timestamp:

11/04/07 18:45:30 (10 months ago)

Author:

otter

Message:

Forgot to save everything before committing. Therefore again:
Bug in torque calculation of Rotational correct, if bearing was not fixed to ground
(speed in torque calculation was the speed of the flange and not the correct relative speed to the bearing).

Files:

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

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

@@ -1939 +1939 @@
     partial model PartialSpeedDependentTorque 
       "Partial model of a torque acting at the flange (accelerates the flange)" 
-      Modelica.SIunits.AngularVelocity w = der(flange.phi) 
-        "Angular velocity at flange";
-      Modelica.SIunits.Torque tau = flange.tau 
-        "accelerating torque acting at flange";
+      Modelica.SIunits.Angle phi 
+        "Angle of flange with respect to bearing (= flange.phi - bearing.phi)";
+      Modelica.SIunits.AngularVelocity w 
+        "Angular velocity at flange with respect to bearing (= der(phi))";
+      Modelica.SIunits.Torque tau "Accelerating torque acting at flange";
       Modelica.Mechanics.Rotational.Interfaces.Flange_b flange 
         "Flange on which torque is acting" 
@@ -1983 +1984 @@
 </HTML>"));
     equation 
+      phi = flange.phi - bearing.phi;
+      w = der(phi);
+      tau = flange.tau;
       if cardinality(bearing) == 0 then
         bearing.phi = 0;