Limits output issue.

2024-04-08 23:01:06 -06:00
parent 55963abe51
commit 8d3aecbcfb
31 changed files with 47 additions and 38 deletions
--- a/testapp/CrankSlider2debug1.asmt
+++ b/testapp/CrankSlider2debug1.asmt
@@ -407,6 +407,7 @@ Assembly
 					/Assembly/joint_2
 				RotationZ
 					integral(time,  rampstep(time, 0.0, 0.0, 1.0, 0.0 + 10.0*(1.0 - 0.0)))
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/CrankSlider2debug2.asmt
+++ b/testapp/CrankSlider2debug2.asmt
@@ -407,6 +407,7 @@ Assembly
 					/Assembly/joint_2
 				RotationZ
 					integral(time,  rampstep(time, 0.0, 0.0, 1.0, 0.0 + 10.0*(1.0 - 0.0)))
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/InitialConditionsdebug1.asmt
+++ b/testapp/InitialConditionsdebug1.asmt
@@ -54,6 +54,7 @@ Assembly
 	ConstraintSets
 		Joints
 		Motions
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/InitialConditionsdebug2.asmt
+++ b/testapp/InitialConditionsdebug2.asmt
@@ -54,6 +54,7 @@ Assembly
 	ConstraintSets
 		Joints
 		Motions
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase(Cosine-half
+++ b/testapp/MBDynCase(Cosine-half
@@ -168,6 +168,7 @@ Assembly
 					/Assembly/structural_node_1/Marker1
 				MarkerJ
 					/Assembly/structural_node_2/Marker0
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase(Cosine-half
+++ b/testapp/MBDynCase(Cosine-half
@@ -168,6 +168,7 @@ Assembly
 					/Assembly/structural_node_1/Marker1
 				MarkerJ
 					/Assembly/structural_node_2/Marker0
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase(Sine-forever
+++ b/testapp/MBDynCase(Sine-forever
@@ -168,6 +168,7 @@ Assembly
 					/Assembly/structural_node_1/Marker1
 				MarkerJ
 					/Assembly/structural_node_2/Marker0
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase(Sine-forever
+++ b/testapp/MBDynCase(Sine-forever
@@ -168,6 +168,7 @@ Assembly
 					/Assembly/structural_node_1/Marker1
 				MarkerJ
 					/Assembly/structural_node_2/Marker0
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase2debug1.asmt
+++ b/testapp/MBDynCase2debug1.asmt
@@ -407,6 +407,7 @@ Assembly
 					/Assembly/joint_2
 				RotationZ
 					integral(time,  rampstep(time, 0.0, 0.0, 1.0, 0.0 + 6.28*(1.0 - 0.0)))
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase2debug2.asmt
+++ b/testapp/MBDynCase2debug2.asmt
@@ -407,6 +407,7 @@ Assembly
 					/Assembly/joint_2
 				RotationZ
 					integral(time,  rampstep(time, 0.0, 0.0, 1.0, 0.0 + 6.28*(1.0 - 0.0)))
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase5origdebug1.asmt
+++ b/testapp/MBDynCase5origdebug1.asmt
@@ -979,6 +979,7 @@ Assembly
 					/Assembly/joint_19
 				RotationZ
 					integral(time,  rampstep(time, 0.25, 0.0, 2.0, 0.0 + 5.0*(2.0 - 0.25))/2)
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase5origdebug2.asmt
+++ b/testapp/MBDynCase5origdebug2.asmt
@@ -979,6 +979,7 @@ Assembly
 					/Assembly/joint_19
 				RotationZ
 					integral(time,  rampstep(time, 0.25, 0.0, 2.0, 0.0 + 5.0*(2.0 - 0.25))/2)
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase8origdebug1.asmt
+++ b/testapp/MBDynCase8origdebug1.asmt
@@ -845,6 +845,7 @@ Assembly
 					/Assembly/joint_2
 				RotationZ
 					integral(time,  rampstep(time, 0.25, 0.0, 3.0, 0.0 + 1.0*(3.0 - 0.25)))
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase8origdebug2.asmt
+++ b/testapp/MBDynCase8origdebug2.asmt
@@ -845,6 +845,7 @@ Assembly
 					/Assembly/joint_2
 				RotationZ
 					integral(time,  rampstep(time, 0.25, 0.0, 3.0, 0.0 + 1.0*(3.0 - 0.25)))
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase9origdebug1.asmt
+++ b/testapp/MBDynCase9origdebug1.asmt
@@ -1595,6 +1595,7 @@ Assembly
 					/Assembly/joint_4
 				RotationZ
 					integral(time,  rampstep(time, 0.25, 0.0, 2.0, 0.0 + 0.5*(2.0 - 0.25)))
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/MBDynCase9origdebug2.asmt
+++ b/testapp/MBDynCase9origdebug2.asmt
@@ -1595,6 +1595,7 @@ Assembly
 					/Assembly/joint_4
 				RotationZ
 					integral(time,  rampstep(time, 0.25, 0.0, 2.0, 0.0 + 0.5*(2.0 - 0.25)))
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/OndselSolver.cpp
+++ b/testapp/OndselSolver.cpp
@@ -26,8 +26,8 @@ void sharedptrTest();

 int main()
 {
-	ASMTAssembly::runDraggingTest3();
 	ASMTAssembly::runDraggingTest2();
+	ASMTAssembly::runDraggingTest3();
 	ASMTAssembly::runDraggingTest();
 	//ASMTAssembly::runFile("../testapp/pistonWithLimits.asmt");
 	ASMTAssembly::runFile("../testapp/pistonAllowZRotation.asmt");
--- a/testapp/SphericalHingedebug1.asmt
+++ b/testapp/SphericalHingedebug1.asmt
@@ -168,6 +168,7 @@ Assembly
 				MarkerJ
 					/Assembly/structural_node_1/Marker1
 		Motions
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity
--- a/testapp/SphericalHingedebug2.asmt
+++ b/testapp/SphericalHingedebug2.asmt
@@ -168,6 +168,7 @@ Assembly
 				MarkerJ
 					/Assembly/structural_node_1/Marker1
 		Motions
+		Limits
 		GeneralConstraintSets
 	ForceTorques
 	ConstantGravity