sixDoFRigidBodyMotion: remove the constraint and restraint "Coeffs"

sub-dict and put the coefficients in the containing dictionary.

src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C

@@ -43,14 +43,7 @@ Foam::sixDoFRigidBodyMotionConstraint::sixDoFRigidBodyMotionConstraint
 )
 :
     name_(name),
-    sDoFRBMCCoeffs_
+    sDoFRBMCCoeffs_(sDoFRBMCDict)
-    (
-        sDoFRBMCDict.subDict
-        (
-            word(sDoFRBMCDict.lookup("sixDoFRigidBodyMotionConstraint"))
-          + "Coeffs"
-        )
-    )
 {}
 
 
@@ -67,7 +60,7 @@ bool Foam::sixDoFRigidBodyMotionConstraint::read
     const dictionary& sDoFRBMCDict
 )
 {
-    sDoFRBMCCoeffs_ = sDoFRBMCDict.subDict(type() + "Coeffs");
+    sDoFRBMCCoeffs_ = sDoFRBMCDict;
 
     return true;
 }

src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C

@@ -29,9 +29,8 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(sixDoFRigidBodyMotionRestraint, 0);
+    defineTypeNameAndDebug(sixDoFRigidBodyMotionRestraint, 0);
-
+    defineRunTimeSelectionTable(sixDoFRigidBodyMotionRestraint, dictionary);
-defineRunTimeSelectionTable(sixDoFRigidBodyMotionRestraint, dictionary);
 }
 
 
@@ -44,14 +43,7 @@ Foam::sixDoFRigidBodyMotionRestraint::sixDoFRigidBodyMotionRestraint
 )
 :
     name_(name),
-    sDoFRBMRCoeffs_
+    sDoFRBMRCoeffs_(sDoFRBMRDict)
-    (
-        sDoFRBMRDict.subDict
-        (
-            word(sDoFRBMRDict.lookup("sixDoFRigidBodyMotionRestraint"))
-          + "Coeffs"
-        )
-    )
 {}
 
 
@@ -68,7 +60,7 @@ bool Foam::sixDoFRigidBodyMotionRestraint::read
     const dictionary& sDoFRBMRDict
 )
 {
-    sDoFRBMRCoeffs_ = sDoFRBMRDict.subDict(type() + "Coeffs");
+    sDoFRBMRCoeffs_ = sDoFRBMRDict;
 
     return true;
 }

src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C

@@ -151,7 +151,7 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
         dict.lookupOrDefault
         (
             "initialOrientation",
-            dict.lookupOrDefault("orientation", I)
+            dict.lookupOrDefault("orientation", tensor::I)
         )
     ),
     momentOfInertia_(dict.lookup("momentOfInertia")),

src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C

@@ -63,7 +63,7 @@ Foam::sixDoFRigidBodyMotionState::sixDoFRigidBodyMotionState
 )
 :
     centreOfMass_(dict.lookup("centreOfMass")),
-    Q_(dict.lookupOrDefault("orientation", tensor(I))),
+    Q_(dict.lookupOrDefault("orientation", tensor::I)),
     v_(dict.lookupOrDefault("velocity", vector::zero)),
     a_(dict.lookupOrDefault("acceleration", vector::zero)),
     pi_(dict.lookupOrDefault("angularMomentum", vector::zero)),

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement

@@ -50,11 +50,8 @@ boundaryField
                 sixDoFRigidBodyMotionConstraint fixedLine;
                 tolerance        1e-9;
                 relaxationFactor 0.7;
-                fixedLineCoeffs
+                refPoint      (0.25 0.007 0.125);
-                {
+                direction     (0 1 0);
-                    refPoint      (0.25 0.007 0.125);
-                    direction     (0 1 0);
-                }
             }
 
             fixedAxis1
@@ -62,10 +59,7 @@ boundaryField
                 sixDoFRigidBodyMotionConstraint fixedAxis;
                 tolerance       1e-06;
                 relaxationFactor 0.7;
-                fixedAxisCoeffs
+                axis            (0 0 1);
-                {
-                    axis            ( 0 0 1 );
-                }
             }
         }
         restraints
@@ -73,27 +67,19 @@ boundaryField
             verticalSpring
             {
                 sixDoFRigidBodyMotionRestraint linearSpring;
-
+                anchor          (0.25 0.007 0.125);
-                linearSpringCoeffs
+                refAttachmentPt (0.25 0.007 0.125);
-                {
+                stiffness       4000;
-                    anchor          (0.25 0.007 0.125);
+                damping         2;
-                    refAttachmentPt (0.25 0.007 0.125);
+                restLength      0;
-                    stiffness       4000;
-                    damping         2;
-                    restLength      0;
-                }
             }
             axialSpring
             {
                 sixDoFRigidBodyMotionRestraint linearAxialAngularSpring;
-
+                axis            (0 0 1);
-                linearAxialAngularSpringCoeffs
+                stiffness       700;
-                {
+                damping         0.5;
-                    axis            (0 0 1);
+                referenceOrientation $orientation;
-                    stiffness       700;
-                    damping         0.5;
-                    referenceOrientation $orientation;
-                }
             }
         }
         value           uniform (0 0 0);
@@ -109,11 +95,11 @@ boundaryField
         type            empty;
     }
 
-     ".*"
+    ".*"
-     {
+    {
-         type            fixedValue;
+        type            fixedValue;
-         value           uniform (0 0 0);
+        value           uniform (0 0 0);
-     }
+    }
 }
 
 

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict

@@ -16,7 +16,7 @@ FoamFile
 
 dynamicFvMesh      dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs ("libfvMotionSolvers.so" "libsixDoFRigidBodyMotion.so");
 
 solver            displacementLaplacian;
 

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary

@@ -21,37 +21,40 @@ FoamFile
     {
         type            patch;
         nFaces          72;
-        startFace       25168;
+        startFace       22911;
     }
     inlet
     {
         type            patch;
         nFaces          40;
-        startFace       25240;
+        startFace       22983;
     }
     outlet
     {
         type            patch;
         nFaces          62;
-        startFace       25280;
+        startFace       23023;
     }
     front
     {
         type            empty;
-        nFaces          12559;
+        inGroups        1(empty);
-        startFace       25342;
+        nFaces          11431;
+        startFace       23085;
     }
     back
     {
         type            empty;
-        nFaces          12559;
+        inGroups        1(empty);
-        startFace       37901;
+        nFaces          11431;
+        startFace       34516;
     }
     wing
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          378;
-        startFace       50460;
+        startFace       45947;
     }
 )
 

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary

@@ -21,37 +21,40 @@ FoamFile
     {
         type            patch;
         nFaces          72;
-        startFace       25168;
+        startFace       22911;
     }
     inlet
     {
         type            patch;
         nFaces          40;
-        startFace       25240;
+        startFace       22983;
     }
     outlet
     {
         type            patch;
         nFaces          62;
-        startFace       25280;
+        startFace       23023;
     }
     front
     {
         type            empty;
-        nFaces          12559;
+        inGroups        1(empty);
-        startFace       25342;
+        nFaces          11431;
+        startFace       23085;
     }
     back
     {
         type            empty;
-        nFaces          12559;
+        inGroups        1(empty);
-        startFace       37901;
+        nFaces          11431;
+        startFace       34516;
     }
     wing
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          378;
-        startFace       50460;
+        startFace       45947;
     }
 )
 

tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement

@@ -33,7 +33,6 @@ boundaryField
         momentOfInertia (0.1052 0.1052 0.1778);
         mass            9.6;
         velocity        (0 0 0);
-        orientation     (1 0 0 0 1 0 0 0 1);
         acceleration    (0 0 0);
         angularMomentum (0 0 0);
         torque          (0 0 0);
@@ -46,14 +45,11 @@ boundaryField
             {
                 sixDoFRigidBodyMotionRestraint linearSpring;
 
-                linearSpringCoeffs
+                anchor          (0.5 0.5 1);
-                {
+                refAttachmentPt $centreOfMass;
-                    anchor          (0.5 0.5 1);
+                stiffness       5000;
-                    refAttachmentPt $centreOfMass;
+                damping         50;
-                    stiffness       5000;
+                restLength      0.4;
-                    damping         50;
-                    restLength      0.4;
-                }
             }
         }
         constraints
@@ -65,7 +61,6 @@ boundaryField
                 sixDoFRigidBodyMotionConstraint fixedOrientation;
                 tolerance           1e-6;
                 relaxationFactor    1.0;
-                fixedOrientationCoeffs {}
             }
 
             fixedLine1
@@ -73,11 +68,8 @@ boundaryField
                 sixDoFRigidBodyMotionConstraint fixedLine;
                 tolerance           1e-6;
                 relaxationFactor    1.0;
-                fixedLineCoeffs
+                refPoint            $centreOfMass;
-                {
+                direction           (0 0 1);
-                    refPoint      $centreOfMass;
-                    direction     (0 0 1);
-                }
             }
         }
         value           uniform (0 0 0);

tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict

@@ -16,7 +16,7 @@ FoamFile
 
 dynamicFvMesh      dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs ("libfvMotionSolvers.so" "libsixDoFRigidBodyMotion.so");
 
 solver            displacementLaplacian;
 

tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary

@@ -20,6 +20,7 @@ FoamFile
     stationaryWalls
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          11200;
         startFace       277808;
     }
@@ -32,6 +33,7 @@ FoamFile
     floatingObject
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          672;
         startFace       290608;
     }