From 3b7757245684a1ef6330bf5bfc844c49c0834063 Mon Sep 17 00:00:00 2001 From: Vuko Vukcevic Date: Fri, 28 Apr 2017 07:27:59 +0200 Subject: [PATCH] Updated sixDOFSolver tutorials Removed unnecessary input left from the old formulation --- tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyA | 15 +-------------- tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyB | 13 ------------- .../sixDOFSolver/springDamper/0/massSpringDamper | 13 ------------- 3 files changed, 1 insertion(+), 40 deletions(-) diff --git a/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyA b/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyA index 5b4be3598..1a569ab9d 100644 --- a/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyA +++ b/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyA @@ -19,15 +19,10 @@ mass m [1 0 0 0 0 0 0] 1; momentOfInertia J [1 2 0 0 0 0 0] (1 1 1); equilibriumPosition Xeq [0 1 0 0 0 0 0] (0 0 0); -linearSpring k [1 0 -2 0 0 0 0] (1 1 1); -linearDamping d [1 0 -1 0 0 0 0] (0 0 0); force f [1 1 -2 0 0 0 0] (0 0 0); moment m [1 2 -2 0 0 0 0] (0 0 0); -forceRelative fRel [1 1 -2 0 0 0 0] (0 0 0); -momentRelative mRel [1 2 -2 0 0 0 0] (-0.5773502692 -0.5773502692 -0.5773502692); - // Specific input for certain sixDOFODE (here quaternionSixDOF) type quaternionSixDOF; @@ -38,15 +33,7 @@ Uold Uold [0 1 -1 0 0 0 0] (1 0 0); rotationVector (0 0 1); rotationAngle rotationAngle [0 0 0 0 0 0 0] 0; -omega rotUrel [0 0 -1 0 0 0 0] (0.5773502692 0.5773502692 0.5773502692); - -// Motion constraints -fixedSurge no; -fixedSway no; -fixedHeave no; -fixedRoll no; -fixedPitch no; -fixedYaw no; +omega rotUrel [0 0 -1 0 0 0 0] (0.5773502692 0.5773502692 0.5773502692); // ************************************************************************* // diff --git a/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyB b/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyB index f1a81dc2e..e6de23e41 100644 --- a/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyB +++ b/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyB @@ -19,15 +19,10 @@ mass m [1 0 0 0 0 0 0] 1; momentOfInertia J [1 2 0 0 0 0 0] (1 1 1); equilibriumPosition Xeq [0 1 0 0 0 0 0] (-1 0 0); -linearSpring k [1 0 -2 0 0 0 0] (1 1 1); -linearDamping d [1 0 -1 0 0 0 0] (0 0 0); force f [1 1 -2 0 0 0 0] (0 0 0); moment m [1 2 -2 0 0 0 0] (0 0 0); -forceRelative fRel [1 1 -2 0 0 0 0] (0 0 0); -momentRelative mRel [1 2 -2 0 0 0 0] (0 0 10); - // Specific input for certain sixDOFODE (here quaternionSixDOF) type quaternionSixDOF; @@ -39,13 +34,5 @@ rotationVector (0 0 1); rotationAngle rA [0 0 0 0 0 0 0] 0; omega rotU [0 0 -1 0 0 0 0] (0 -1 0); -// Motion constraints -fixedSurge no; -fixedSway no; -fixedHeave no; -fixedRoll no; -fixedPitch no; -fixedYaw no; - // ************************************************************************* // diff --git a/tutorials/basic/sixDOFSolver/springDamper/0/massSpringDamper b/tutorials/basic/sixDOFSolver/springDamper/0/massSpringDamper index 29caaa510..539e85630 100644 --- a/tutorials/basic/sixDOFSolver/springDamper/0/massSpringDamper +++ b/tutorials/basic/sixDOFSolver/springDamper/0/massSpringDamper @@ -19,15 +19,10 @@ mass m [1 0 0 0 0 0 0] 1; momentOfInertia J [1 2 0 0 0 0 0] (1 1 1); equilibriumPosition Xeq [0 1 0 0 0 0 0] (2 0 0); -linearSpring k [1 0 -2 0 0 0 0] (1 0 0); -linearDamping d [1 0 -1 0 0 0 0] (1 0 0); force f [1 1 -2 0 0 0 0] (0 0 0); moment m [1 2 -2 0 0 0 0] (0 0 0); -forceRelative fRel [1 1 -2 0 0 0 0] (0 0 0); -momentRelative mRel [1 2 -2 0 0 0 0] (0 0 0); - // Specific input for certain sixDOFODE (here quaternionSixDOF) type quaternionSixDOF; @@ -39,13 +34,5 @@ rotationVector (0 0 1); rotationAngle rotA [0 0 0 0 0 0 0] 0; omega rotU [0 0 -1 0 0 0 0] (0 0 0); -// Motion constraints -fixedSurge no; -fixedSway no; -fixedHeave no; -fixedRoll no; -fixedPitch no; -fixedYaw no; - // ************************************************************************* //