From 8af82f02bf9df293e762d56fcf4df82b4c701139 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 15 Dec 2013 22:30:52 +0000
Subject: [PATCH] sixDoFRigidBodyMotion: remove the constraint and restraint
"Coeffs" sub-dict and put the coefficients in the containing dictionary.
---
.../sixDoFRigidBodyMotionConstraint.C | 11 +----
.../sixDoFRigidBodyMotionRestraint.C | 16 ++-----
.../sixDoFRigidBodyMotion.C | 2 +-
.../sixDoFRigidBodyMotionState.C | 2 +-
.../0.org/pointDisplacement | 48 +++++++------------
.../constant/dynamicMeshDict | 2 +-
.../constant/polyMesh/boundary | 19 ++++----
.../constant/polyMesh/boundary | 19 ++++----
.../0.org/pointDisplacement | 22 +++------
.../constant/dynamicMeshDict | 2 +-
.../floatingObject/constant/polyMesh/boundary | 2 +
11 files changed, 58 insertions(+), 87 deletions(-)
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
index 6a497d4de5a..10044ac8328 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
@@ -43,14 +43,7 @@ Foam::sixDoFRigidBodyMotionConstraint::sixDoFRigidBodyMotionConstraint
)
:
name_(name),
- sDoFRBMCCoeffs_
- (
- sDoFRBMCDict.subDict
- (
- word(sDoFRBMCDict.lookup("sixDoFRigidBodyMotionConstraint"))
- + "Coeffs"
- )
- )
+ sDoFRBMCCoeffs_(sDoFRBMCDict)
{}
@@ -67,7 +60,7 @@ bool Foam::sixDoFRigidBodyMotionConstraint::read
const dictionary& sDoFRBMCDict
)
{
- sDoFRBMCCoeffs_ = sDoFRBMCDict.subDict(type() + "Coeffs");
+ sDoFRBMCCoeffs_ = sDoFRBMCDict;
return true;
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
index 31c16f85acd..6f53b504078 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
@@ -29,9 +29,8 @@ License
namespace Foam
{
-defineTypeNameAndDebug(sixDoFRigidBodyMotionRestraint, 0);
-
-defineRunTimeSelectionTable(sixDoFRigidBodyMotionRestraint, dictionary);
+ defineTypeNameAndDebug(sixDoFRigidBodyMotionRestraint, 0);
+ defineRunTimeSelectionTable(sixDoFRigidBodyMotionRestraint, dictionary);
}
@@ -44,14 +43,7 @@ Foam::sixDoFRigidBodyMotionRestraint::sixDoFRigidBodyMotionRestraint
)
:
name_(name),
- sDoFRBMRCoeffs_
- (
- sDoFRBMRDict.subDict
- (
- word(sDoFRBMRDict.lookup("sixDoFRigidBodyMotionRestraint"))
- + "Coeffs"
- )
- )
+ sDoFRBMRCoeffs_(sDoFRBMRDict)
{}
@@ -68,7 +60,7 @@ bool Foam::sixDoFRigidBodyMotionRestraint::read
const dictionary& sDoFRBMRDict
)
{
- sDoFRBMRCoeffs_ = sDoFRBMRDict.subDict(type() + "Coeffs");
+ sDoFRBMRCoeffs_ = sDoFRBMRDict;
return true;
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index b3a013328c2..99d3728c06e 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/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")),
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
index e92274c0984..0e9aada9d01 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
+++ b/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)),
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
index 7063b7a0637..3714898106c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
+++ b/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;
-
- linearSpringCoeffs
- {
- anchor (0.25 0.007 0.125);
- refAttachmentPt (0.25 0.007 0.125);
- stiffness 4000;
- damping 2;
- restLength 0;
- }
+ anchor (0.25 0.007 0.125);
+ refAttachmentPt (0.25 0.007 0.125);
+ stiffness 4000;
+ damping 2;
+ restLength 0;
}
axialSpring
{
sixDoFRigidBodyMotionRestraint linearAxialAngularSpring;
-
- linearAxialAngularSpringCoeffs
- {
- axis (0 0 1);
- stiffness 700;
- damping 0.5;
- referenceOrientation $orientation;
- }
+ axis (0 0 1);
+ stiffness 700;
+ damping 0.5;
+ referenceOrientation $orientation;
}
}
value uniform (0 0 0);
@@ -109,11 +95,11 @@ boundaryField
type empty;
}
- ".*"
- {
- type fixedValue;
- value uniform (0 0 0);
- }
+ ".*"
+ {
+ type fixedValue;
+ value uniform (0 0 0);
+ }
}
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
index 4fad53756a4..82d0874bde9 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
+++ b/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;
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary
index d49af660efa..927a3109ec4 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary
+++ b/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;
- startFace 25342;
+ inGroups 1(empty);
+ nFaces 11431;
+ startFace 23085;
}
back
{
type empty;
- nFaces 12559;
- startFace 37901;
+ inGroups 1(empty);
+ nFaces 11431;
+ startFace 34516;
}
wing
{
type wall;
+ inGroups 1(wall);
nFaces 378;
- startFace 50460;
+ startFace 45947;
}
)
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary
index d49af660efa..927a3109ec4 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary
+++ b/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;
- startFace 25342;
+ inGroups 1(empty);
+ nFaces 11431;
+ startFace 23085;
}
back
{
type empty;
- nFaces 12559;
- startFace 37901;
+ inGroups 1(empty);
+ nFaces 11431;
+ startFace 34516;
}
wing
{
type wall;
+ inGroups 1(wall);
nFaces 378;
- startFace 50460;
+ startFace 45947;
}
)
diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement
index d2b845620a5..ae806ac27aa 100644
--- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement
+++ b/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;
- stiffness 5000;
- damping 50;
- restLength 0.4;
- }
+ anchor (0.5 0.5 1);
+ refAttachmentPt $centreOfMass;
+ stiffness 5000;
+ 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);
diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict
index b4afb714421..ad68458956f 100644
--- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict
@@ -16,7 +16,7 @@ FoamFile
dynamicFvMesh dynamicMotionSolverFvMesh;
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs ("libfvMotionSolvers.so" "libsixDoFRigidBodyMotion.so");
solver displacementLaplacian;
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary
index 1543006b7ac..adb36836efd 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary
+++ b/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;
}
--
GitLab