From b2625b60a5597ac5a63b5d66a891e23dc776e20d Mon Sep 17 00:00:00 2001 From: Vuko Vukcevic Date: Tue, 28 Feb 2017 16:08:24 +0100 Subject: [PATCH] Updates to sixDOFSolver tutorials --- tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyA | 14 +++++++------- tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyB | 14 +++++++------- .../sixDOFSolver/springDamper/0/massSpringDamper | 15 +++++++-------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyA b/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyA index af375e662..5b4be3598 100644 --- a/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyA +++ b/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyA @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Mass properties and restraints (common to all sixDOFODE's) +// Mass properties and inputs common to all sixDOFODE's mass m [1 0 0 0 0 0 0] 1; momentOfInertia J [1 2 0 0 0 0 0] (1 1 1); @@ -22,6 +22,12 @@ 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; @@ -34,12 +40,6 @@ 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); -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); - // Motion constraints fixedSurge no; fixedSway no; diff --git a/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyB b/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyB index 867489189..f1a81dc2e 100644 --- a/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyB +++ b/tutorials/basic/sixDOFSolver/sixDOFmotion/0/bodyB @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Mass properties and restraints (common to all sixDOFODE's) +// Mass properties and inputs common to all sixDOFODE's mass m [1 0 0 0 0 0 0] 1; momentOfInertia J [1 2 0 0 0 0 0] (1 1 1); @@ -22,6 +22,12 @@ 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; @@ -33,12 +39,6 @@ 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); -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); - // Motion constraints fixedSurge no; fixedSway no; diff --git a/tutorials/basic/sixDOFSolver/springDamper/0/massSpringDamper b/tutorials/basic/sixDOFSolver/springDamper/0/massSpringDamper index aaed6cc9b..29caaa510 100644 --- a/tutorials/basic/sixDOFSolver/springDamper/0/massSpringDamper +++ b/tutorials/basic/sixDOFSolver/springDamper/0/massSpringDamper @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Mass properties and restraints (common to all sixDOFODE's) +// Mass properties and inputs common to all sixDOFODE's mass m [1 0 0 0 0 0 0] 1; momentOfInertia J [1 2 0 0 0 0 0] (1 1 1); @@ -22,6 +22,12 @@ 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; @@ -33,13 +39,6 @@ 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); -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); - - // Motion constraints fixedSurge no; fixedSway no;