Changeset 1040 for branches/maintenance/2.2.2

Timestamp:

02/07/08 20:34:48 (8 months ago)

Author:

otter

Message:

- Bug in Rotational.Backlash fixed. If phi_rel0 is not zero, the equations have been wrong.
- Release notes updated

Location:

branches/maintenance/2.2.2/Modelica

Files:

• Mechanics/Rotational.mo (modified) (2 diffs)
• package.mo (modified) (2 diffs)

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

@@ -2824 +2824 @@
   protected 
     SI.Angle b2=b/2;
+    SI.Angle phi_diff;
     // A minimum backlash is defined in order to avoid an infinite
     // number of state events if backlash b is set to zero.
@@ -2963 +2964 @@
         Line(points=[-79, -96; -8, -96], style(color=10, fillColor=10))));
   equation 
+    phi_diff = phi_rel - phi_rel0;
     w_rel = der(phi_rel);
-    tau = if b2 > b_min then (if phi_rel > b2 then c*(phi_rel - phi_rel0 - b2)
-       + d*w_rel else (if phi_rel < -b2 then c*(phi_rel - phi_rel0 + b2) + d*
-      w_rel else 0)) else c*(phi_rel - phi_rel0) + d*w_rel;
+    tau = if b2 > b_min then (if phi_diff > b2 then c*(phi_diff - b2)
+       + d*w_rel else (if phi_diff < -b2 then c*(phi_diff + b2) + d*
+      w_rel else 0)) else c*phi_diff + d*w_rel;
   end ElastoBacklash;
   

branches/maintenance/2.2.2/Modelica/package.mo

@@ -591 +591 @@
  
 <table border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
-  <tr><td colspan=\"2\"><b>Package-Name.</b></td></tr>
-  <tr><td valign=\"top\"> Model-Name </td>
-      <td valign=\"top\"> Description text</td> 
-  </tr>
   <tr><td colspan=\"2\"><b>Mechanics.MultiBody.Parts</b></td></tr>
   <tr><td valign=\"top\"> Rotor1D </td>
@@ -610 +606 @@
       <td valign=\"top\"> Speed used in torque calculation was der(flange.phi) and not
                         the speed relative to the bearing<br> (= der(flange.phi) - der(bearing.phi)).
-                        This was correct. This bug leads to wrong simulation results,<br> 
+                        This was corrected. This bug leads to wrong simulation results,<br> 
                         when the bearing is not fixed to ground </td> 
+  </tr>
+  <tr><td valign=\"top\"> Backlash </td>
+      <td valign=\"top\"> If parameter phi_rel0 is not zero, the equations have been wrong.
+                        This bug has been fixed.  </td> 
   </tr>