Changeset 660 for Modelica/branches/maintenance/2.2.2/Modelica/Mechanics/MultiBody/Forces.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/MultiBody/Forces.mo (modified) (3 diffs)

Modelica/branches/maintenance/2.2.2/Modelica/Mechanics/MultiBody/Forces.mo

@@ -1565 +1565 @@
     SI.Position r_rel_0[3] 
       "Position vector from frame_a to frame_b resolved in world frame";
-    SI.Position e_rel_0[3] 
+    Real e_rel_0[3] 
       "Unit vector in direction from frame_a to frame_b, resolved in world frame";
     annotation (
@@ -2262 +2262 @@
       "Reflection of ambient light (= 0: light is completely absorbed)" 
       annotation (Dialog(tab="Animation", group="if animation = true", enable=animation));
-    input Real massDiameter=max(0, (width - 2*coilWidth)*0.9) 
+    input SIunits.Diameter massDiameter=max(0, (width - 2*coilWidth)*0.9) 
       " Diameter of mass point sphere" annotation (Dialog(tab="Animation", group=
             "if animation = true and showMass = true", enable=animation and showMass));
@@ -2356 +2356 @@
       " Length of cylinder at frame_a side" 
       annotation (Dialog(tab="Animation", group="if animation = true", enable=animation));
-    input SI.Distance diameter_a=world.defaultForceWidth 
+    input SIunits.Diameter diameter_a=world.defaultForceWidth 
       " Diameter of cylinder at frame_a side" 
       annotation (Dialog(tab="Animation", group="if animation = true", enable=animation));
-    input Real diameter_b=0.6*diameter_a 
+    input SIunits.Diameter diameter_b=0.6*diameter_a 
       " Diameter of cylinder at frame_b side" 
       annotation (Dialog(tab="Animation", group="if animation = true", enable=animation));