Changeset 478 for branches/maintenance/2.2.1

Timestamp:

01/26/07 14:42:42 (21 months ago)

Author:

HansOlsson

Message:

Use a better residual for large residuals

Files:

• branches/maintenance/2.2.1/Modelica/Mechanics/MultiBody/Frames.mo (modified) (1 diff)

branches/maintenance/2.2.1/Modelica/Mechanics/MultiBody/Frames.mo

@@ -198 +198 @@
         "The rotation angles around x-, y-, and z-axis of frame 1 to rotate frame 1 into frame 2 for a small rotation (should be zero)";
     algorithm 
-      residue := {cross(R1.T[1, :], R1.T[2, :])*R2.T[2, :],-cross(R1.T[1, :],
-        R1.T[2, :])*R2.T[1, :],R1.T[2, :]*R2.T[1, :]};
+      residue := {
+         Modelica.Math.atan2(cross(R1.T[1, :], R1.T[2, :])*R2.T[2, :],R1.T[1,:]*R2.T[1,:]),
+         Modelica.Math.atan2(-cross(R1.T[1, :],R1.T[2, :])*R2.T[1, :],R1.T[2,:]*R2.T[2,:]),
+         Modelica.Math.atan2(R1.T[2, :]*R2.T[1, :],R1.T[3,:]*R2.T[3,:])};
     end equalityConstraint;