diff --git a/src/sixDoFRigidBodyMotion/Make/files b/src/sixDoFRigidBodyMotion/Make/files
index 75435920ea441c167af884370570c97ad5eae050..02ef85eaa166950aca7002c62ea8134faa75afc3 100644
--- a/src/sixDoFRigidBodyMotion/Make/files
+++ b/src/sixDoFRigidBodyMotion/Make/files
@@ -16,11 +16,11 @@ constraints = sixDoFRigidBodyMotion/constraints
$(constraints)/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
$(constraints)/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
-$(constraints)/fixedAxis/fixedAxis.C
-$(constraints)/fixedLine/fixedLine.C
-$(constraints)/fixedOrientation/fixedOrientation.C
-$(constraints)/fixedPlane/fixedPlane.C
-$(constraints)/fixedPoint/fixedPoint.C
+$(constraints)/axis/sixDoFRigidBodyMotionAxisConstraint.C
+$(constraints)/line/sixDoFRigidBodyMotionLineConstraint.C
+$(constraints)/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
+$(constraints)/plane/sixDoFRigidBodyMotionPlaneConstraint.C
+$(constraints)/point/sixDoFRigidBodyMotionPointConstraint.C
pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index 559b3cc1752c890b2ce9682cfe50616b7f7bea01..3a6db8083995cdf1385fa5556c38d89d79742dc7 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -204,10 +204,10 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
const pointPatch& ptPatch = this->patch();
// Store the motion state at the beginning of the time-step
- if (curTimeIndex_ != this->db().time().timeIndex())
+ if (curTimeIndex_ != t.timeIndex())
{
motion_.newTime();
- curTimeIndex_ = this->db().time().timeIndex();
+ curTimeIndex_ = t.timeIndex();
}
// Patch force data is valid for the current positions, so
@@ -238,7 +238,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
g_ = g.value();
}
- // scalar ramp = min(max((this->db().time().value() - 5)/10, 0), 1);
+ // scalar ramp = min(max((t.value() - 5)/10, 0), 1);
scalar ramp = 1.0;
motion_.updateAcceleration
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
index aaae3592221f01318d9c20ac01cb3f906f5d030a..bb66a5fb14b9d06eee60a94faf153370d27b9986 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -47,7 +47,8 @@ uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
:
fixedValuePointPatchField<vector>(p, iF),
motion_(),
- initialPoints_(p.localPoints())
+ initialPoints_(p.localPoints()),
+ curTimeIndex_(-1)
{}
@@ -60,7 +61,8 @@ uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF, dict),
- motion_(dict, dict)
+ motion_(dict, dict),
+ curTimeIndex_(-1)
{
if (!dict.found("value"))
{
@@ -89,7 +91,8 @@ uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
:
fixedValuePointPatchField<vector>(ptf, p, iF, mapper),
motion_(ptf.motion_),
- initialPoints_(ptf.initialPoints_, mapper)
+ initialPoints_(ptf.initialPoints_, mapper),
+ curTimeIndex_(-1)
{}
@@ -102,7 +105,8 @@ uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
:
fixedValuePointPatchField<vector>(ptf, iF),
motion_(ptf.motion_),
- initialPoints_(ptf.initialPoints_)
+ initialPoints_(ptf.initialPoints_),
+ curTimeIndex_(-1)
{}
@@ -147,6 +151,13 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
const polyMesh& mesh = this->dimensionedInternalField().mesh()();
const Time& t = mesh.time();
+ // Store the motion state at the beginning of the time-step
+ if (curTimeIndex_ != t.timeIndex())
+ {
+ motion_.newTime();
+ curTimeIndex_ = t.timeIndex();
+ }
+
motion_.updatePosition(t.deltaTValue(), t.deltaT0Value());
vector gravity = vector::zero;
@@ -163,7 +174,8 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
motion_.updateAcceleration
(
gravity*motion_.mass(),
- vector::zero, t.deltaTValue()
+ vector::zero,
+ t.deltaTValue()
);
Field<vector>::operator=
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
index 3ffaf25bb52b897940ae5892c7deafab7a18ac4f..bd7538ad7127b2bb617c8562c88f07f4e5c67b88 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
@@ -59,6 +59,9 @@ class uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
//- Initial positions of points on the patch
pointField initialPoints_;
+ //- Current time index (used for updating)
+ label curTimeIndex_;
+
public:
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedAxis/fixedAxis.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
similarity index 78%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedAxis/fixedAxis.C
rename to src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
index db7b66a6ff993e33abb9c248b43a83e00e774c8d..9154e51216a7e3d2b1127b0ce6c5c919318c67dd 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedAxis/fixedAxis.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "fixedAxis.H"
+#include "sixDoFRigidBodyMotionAxisConstraint.H"
#include "addToRunTimeSelectionTable.H"
#include "sixDoFRigidBodyMotion.H"
@@ -33,12 +33,12 @@ namespace Foam
{
namespace sixDoFRigidBodyMotionConstraints
{
- defineTypeNameAndDebug(fixedAxis, 0);
+ defineTypeNameAndDebug(axis, 0);
addToRunTimeSelectionTable
(
sixDoFRigidBodyMotionConstraint,
- fixedAxis,
+ axis,
dictionary
);
}
@@ -47,14 +47,14 @@ namespace sixDoFRigidBodyMotionConstraints
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::fixedAxis
+Foam::sixDoFRigidBodyMotionConstraints::axis::axis
(
const word& name,
const dictionary& sDoFRBMCDict
)
:
sixDoFRigidBodyMotionConstraint(name, sDoFRBMCDict),
- fixedAxis_()
+ axis_()
{
read(sDoFRBMCDict);
}
@@ -62,20 +62,20 @@ Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::fixedAxis
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
-Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::~fixedAxis()
+Foam::sixDoFRigidBodyMotionConstraints::axis::~axis()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-void Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::constrainTranslation
+void Foam::sixDoFRigidBodyMotionConstraints::axis::constrainTranslation
(
pointConstraint& pc
) const
{}
-void Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::constrainRotation
+void Foam::sixDoFRigidBodyMotionConstraints::axis::constrainRotation
(
pointConstraint& pc
) const
@@ -84,26 +84,26 @@ void Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::constrainRotation
}
-bool Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::read
+bool Foam::sixDoFRigidBodyMotionConstraints::axis::read
(
const dictionary& sDoFRBMCDict
)
{
sixDoFRigidBodyMotionConstraint::read(sDoFRBMCDict);
- sDoFRBMCCoeffs_.lookup("axis") >> fixedAxis_;
+ sDoFRBMCCoeffs_.lookup("axis") >> axis_;
- scalar magFixedAxis(mag(fixedAxis_));
+ scalar magFixedAxis(mag(axis_));
if (magFixedAxis > VSMALL)
{
- fixedAxis_ /= magFixedAxis;
+ axis_ /= magFixedAxis;
}
else
{
FatalErrorIn
(
- "Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::read"
+ "Foam::sixDoFRigidBodyMotionConstraints::axis::read"
"("
"const dictionary& sDoFRBMCDict"
")"
@@ -116,13 +116,13 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::read
}
-void Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::write
+void Foam::sixDoFRigidBodyMotionConstraints::axis::write
(
Ostream& os
) const
{
os.writeKeyword("axis")
- << fixedAxis_ << token::END_STATEMENT << nl;
+ << axis_ << token::END_STATEMENT << nl;
}
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedAxis/fixedAxis.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H
similarity index 89%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedAxis/fixedAxis.H
rename to src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H
index e2a2cc26da0ebff96788e1188869933228072678..291c3421f86d1b9111db2297cac8bd78b41e96f1 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedAxis/fixedAxis.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H
@@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::sixDoFRigidBodyMotionConstraints::fixedAxis
+ Foam::sixDoFRigidBodyMotionConstraints::axis
Description
sixDoFRigidBodyMotionConstraint. Body may only rotate around
an axis fixed in global space.
SourceFiles
- fixedAxis.C
+ sixDoFRigidBodyMotionAxisConstraint.C
\*---------------------------------------------------------------------------*/
-#ifndef fixedAxis_H
-#define fixedAxis_H
+#ifndef sixDoFRigidBodyMotionAxisConstraint_H
+#define sixDoFRigidBodyMotionAxisConstraint_H
#include "sixDoFRigidBodyMotionConstraint.H"
@@ -47,10 +47,10 @@ namespace sixDoFRigidBodyMotionConstraints
{
/*---------------------------------------------------------------------------*\
- Class fixedAxis Declaration
+ Class axis Declaration
\*---------------------------------------------------------------------------*/
-class fixedAxis
+class axis
:
public sixDoFRigidBodyMotionConstraint
{
@@ -58,19 +58,19 @@ class fixedAxis
// Private data
//- Reference axis in global space
- vector fixedAxis_;
+ vector axis_;
public:
//- Runtime type information
- TypeName("fixedAxis");
+ TypeName("axis");
// Constructors
//- Construct from components
- fixedAxis
+ axis
(
const word& name,
const dictionary& sDoFRBMCDict
@@ -81,13 +81,13 @@ public:
{
return autoPtr<sixDoFRigidBodyMotionConstraint>
(
- new fixedAxis(*this)
+ new axis(*this)
);
}
//- Destructor
- virtual ~fixedAxis();
+ virtual ~axis();
// Member Functions
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedLine/fixedLine.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
similarity index 83%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedLine/fixedLine.C
rename to src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
index 5aa4d669daa7d1ef5400ee1ac884bdc09e831320..ff056c259168321f5e19e27d2ecba98ec0d34707 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedLine/fixedLine.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "fixedLine.H"
+#include "sixDoFRigidBodyMotionLineConstraint.H"
#include "addToRunTimeSelectionTable.H"
#include "sixDoFRigidBodyMotion.H"
@@ -33,12 +33,12 @@ namespace Foam
{
namespace sixDoFRigidBodyMotionConstraints
{
- defineTypeNameAndDebug(fixedLine, 0);
+ defineTypeNameAndDebug(line, 0);
addToRunTimeSelectionTable
(
sixDoFRigidBodyMotionConstraint,
- fixedLine,
+ line,
dictionary
);
}
@@ -47,7 +47,7 @@ namespace sixDoFRigidBodyMotionConstraints
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::sixDoFRigidBodyMotionConstraints::fixedLine::fixedLine
+Foam::sixDoFRigidBodyMotionConstraints::line::line
(
const word& name,
const dictionary& sDoFRBMCDict
@@ -62,13 +62,13 @@ Foam::sixDoFRigidBodyMotionConstraints::fixedLine::fixedLine
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
-Foam::sixDoFRigidBodyMotionConstraints::fixedLine::~fixedLine()
+Foam::sixDoFRigidBodyMotionConstraints::line::~line()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-void Foam::sixDoFRigidBodyMotionConstraints::fixedLine::constrainTranslation
+void Foam::sixDoFRigidBodyMotionConstraints::line::constrainTranslation
(
pointConstraint& pc
) const
@@ -77,14 +77,14 @@ void Foam::sixDoFRigidBodyMotionConstraints::fixedLine::constrainTranslation
}
-void Foam::sixDoFRigidBodyMotionConstraints::fixedLine::constrainRotation
+void Foam::sixDoFRigidBodyMotionConstraints::line::constrainRotation
(
pointConstraint& pc
) const
{}
-bool Foam::sixDoFRigidBodyMotionConstraints::fixedLine::read
+bool Foam::sixDoFRigidBodyMotionConstraints::line::read
(
const dictionary& sDoFRBMCDict
)
@@ -103,7 +103,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedLine::read
{
FatalErrorIn
(
- "Foam::sixDoFRigidBodyMotionConstraints::fixedLine::read"
+ "Foam::sixDoFRigidBodyMotionConstraints::line::read"
"("
"const dictionary& sDoFRBMCDict"
")"
@@ -116,7 +116,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedLine::read
}
-void Foam::sixDoFRigidBodyMotionConstraints::fixedLine::write
+void Foam::sixDoFRigidBodyMotionConstraints::line::write
(
Ostream& os
) const
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedLine/fixedLine.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.H
similarity index 90%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedLine/fixedLine.H
rename to src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.H
index 2e48f564a74a068d1642b308cea38d4b900f9d52..7d4919072024d5803ab23fdbf23ebc5886aaf2ae 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedLine/fixedLine.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.H
@@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::sixDoFRigidBodyMotionConstraints::fixedLine
+ Foam::sixDoFRigidBodyMotionConstraints::line
Description
sixDoFRigidBodyMotionConstraint. Reference point may only move
along a line.
SourceFiles
- fixedLine.C
+ sixDoFRigidBodyMotionLineConstraint.C
\*---------------------------------------------------------------------------*/
-#ifndef fixedLine_H
-#define fixedLine_H
+#ifndef sixDoFRigidBodyMotionLineConstraint_H
+#define sixDoFRigidBodyMotionLineConstraint_H
#include "sixDoFRigidBodyMotionConstraint.H"
@@ -47,10 +47,10 @@ namespace sixDoFRigidBodyMotionConstraints
{
/*---------------------------------------------------------------------------*\
- Class fixedLine Declaration
+ Class line Declaration
\*---------------------------------------------------------------------------*/
-class fixedLine
+class line
:
public sixDoFRigidBodyMotionConstraint
{
@@ -63,13 +63,13 @@ class fixedLine
public:
//- Runtime type information
- TypeName("fixedLine");
+ TypeName("line");
// Constructors
//- Construct from components
- fixedLine
+ line
(
const word& name,
const dictionary& sDoFRBMCDict
@@ -80,13 +80,13 @@ public:
{
return autoPtr<sixDoFRigidBodyMotionConstraint>
(
- new fixedLine(*this)
+ new line(*this)
);
}
//- Destructor
- virtual ~fixedLine();
+ virtual ~line();
// Member Functions
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedOrientation/fixedOrientation.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
similarity index 81%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedOrientation/fixedOrientation.C
rename to src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
index 5d4cc8cff045eb32764069b25d880556dc7bacc1..28bf1c48117067ae84a264c138333569f7206198 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedOrientation/fixedOrientation.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "fixedOrientation.H"
+#include "sixDoFRigidBodyMotionOrientationConstraint.H"
#include "addToRunTimeSelectionTable.H"
#include "sixDoFRigidBodyMotion.H"
@@ -33,12 +33,12 @@ namespace Foam
{
namespace sixDoFRigidBodyMotionConstraints
{
- defineTypeNameAndDebug(fixedOrientation, 0);
+ defineTypeNameAndDebug(orientation, 0);
addToRunTimeSelectionTable
(
sixDoFRigidBodyMotionConstraint,
- fixedOrientation,
+ orientation,
dictionary
);
}
@@ -47,7 +47,7 @@ namespace sixDoFRigidBodyMotionConstraints
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::fixedOrientation
+Foam::sixDoFRigidBodyMotionConstraints::orientation::orientation
(
const word& name,
const dictionary& sDoFRBMCDict
@@ -61,13 +61,13 @@ Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::fixedOrientation
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
-Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::~fixedOrientation()
+Foam::sixDoFRigidBodyMotionConstraints::orientation::~orientation()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-void Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::
+void Foam::sixDoFRigidBodyMotionConstraints::orientation::
constrainTranslation
(
pointConstraint& pc
@@ -75,7 +75,7 @@ constrainTranslation
{}
-void Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::
+void Foam::sixDoFRigidBodyMotionConstraints::orientation::
constrainRotation
(
pointConstraint& pc
@@ -85,7 +85,7 @@ constrainRotation
}
-bool Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::read
+bool Foam::sixDoFRigidBodyMotionConstraints::orientation::read
(
const dictionary& sDoFRBMCDict
)
@@ -96,7 +96,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::read
}
-void Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::write
+void Foam::sixDoFRigidBodyMotionConstraints::orientation::write
(
Ostream& os
) const
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedOrientation/fixedOrientation.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.H
similarity index 87%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedOrientation/fixedOrientation.H
rename to src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.H
index b41945837a82eaa85779db2d9df568e27d06df28..5a41498e9528dfdfc3c4c5a2fd98718f9f49ee86 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedOrientation/fixedOrientation.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.H
@@ -22,18 +22,18 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation
+ Foam::sixDoFRigidBodyMotionConstraints::orientation
Description
Fix orientation of body in global space.
SourceFiles
- fixedOrientation.C
+ sixDoFRigidBodyMotionOrientationConstraint.C
\*---------------------------------------------------------------------------*/
-#ifndef fixedOrientation_H
-#define fixedOrientation_H
+#ifndef sixDoFRigidBodyMotionOrientationConstraint_H
+#define sixDoFRigidBodyMotionOrientationConstraint_H
#include "sixDoFRigidBodyMotionConstraint.H"
@@ -46,10 +46,10 @@ namespace sixDoFRigidBodyMotionConstraints
{
/*---------------------------------------------------------------------------*\
- Class fixedOrientation Declaration
+ Class orientation Declaration
\*---------------------------------------------------------------------------*/
-class fixedOrientation
+class orientation
:
public sixDoFRigidBodyMotionConstraint
{
@@ -57,13 +57,13 @@ class fixedOrientation
public:
//- Runtime type information
- TypeName("fixedOrientation");
+ TypeName("orientation");
// Constructors
//- Construct from components
- fixedOrientation
+ orientation
(
const word& name,
const dictionary& sDoFRBMCDict
@@ -74,13 +74,13 @@ public:
{
return autoPtr<sixDoFRigidBodyMotionConstraint>
(
- new fixedOrientation(*this)
+ new orientation(*this)
);
}
//- Destructor
- virtual ~fixedOrientation();
+ virtual ~orientation();
// Member Functions
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPlane/fixedPlane.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C
similarity index 82%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPlane/fixedPlane.C
rename to src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C
index edcde4d07c22a35b40ee01d6b2cc2dc00e3526d0..286e279b77da5ecb37f49ef9a838645db6e2c743 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPlane/fixedPlane.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "fixedPlane.H"
+#include "sixDoFRigidBodyMotionPlaneConstraint.H"
#include "addToRunTimeSelectionTable.H"
#include "sixDoFRigidBodyMotion.H"
@@ -33,12 +33,12 @@ namespace Foam
{
namespace sixDoFRigidBodyMotionConstraints
{
- defineTypeNameAndDebug(fixedPlane, 0);
+ defineTypeNameAndDebug(plane, 0);
addToRunTimeSelectionTable
(
sixDoFRigidBodyMotionConstraint,
- fixedPlane,
+ plane,
dictionary
);
}
@@ -47,7 +47,7 @@ namespace sixDoFRigidBodyMotionConstraints
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::fixedPlane
+Foam::sixDoFRigidBodyMotionConstraints::plane::plane
(
const word& name,
const dictionary& sDoFRBMCDict
@@ -62,13 +62,13 @@ Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::fixedPlane
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
-Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::~fixedPlane()
+Foam::sixDoFRigidBodyMotionConstraints::plane::~plane()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-void Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::constrainTranslation
+void Foam::sixDoFRigidBodyMotionConstraints::plane::constrainTranslation
(
pointConstraint& pc
) const
@@ -77,14 +77,14 @@ void Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::constrainTranslation
}
-void Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::constrainRotation
+void Foam::sixDoFRigidBodyMotionConstraints::plane::constrainRotation
(
pointConstraint& pc
) const
{}
-bool Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::read
+bool Foam::sixDoFRigidBodyMotionConstraints::plane::read
(
const dictionary& sDoFRBMCDict
)
@@ -97,7 +97,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::read
}
-void Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::write
+void Foam::sixDoFRigidBodyMotionConstraints::plane::write
(
Ostream& os
) const
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPlane/fixedPlane.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.H
similarity index 89%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPlane/fixedPlane.H
rename to src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.H
index 82ed9fab9e714dfd32c32556711fb95d6cad256b..1467e54e783597ac70034bba7840a8121a605c1d 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPlane/fixedPlane.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.H
@@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::sixDoFRigidBodyMotionConstraints::fixedPlane
+ Foam::sixDoFRigidBodyMotionConstraints::plane
Description
sixDoFRigidBodyMotionConstraint. Reference point may only move
along a plane.
SourceFiles
- fixedPlane.C
+ sixDoFRigidBodyMotionPlaneConstraint.C
\*---------------------------------------------------------------------------*/
-#ifndef fixedPlane_H
-#define fixedPlane_H
+#ifndef sixDoFRigidBodyMotionPlaneConstraint_H
+#define sixDoFRigidBodyMotionPlaneConstraint_H
#include "sixDoFRigidBodyMotionConstraint.H"
@@ -47,10 +47,10 @@ namespace sixDoFRigidBodyMotionConstraints
{
/*---------------------------------------------------------------------------*\
- Class fixedPlane Declaration
+ Class plane Declaration
\*---------------------------------------------------------------------------*/
-class fixedPlane
+class plane
:
public sixDoFRigidBodyMotionConstraint
{
@@ -63,13 +63,13 @@ class fixedPlane
public:
//- Runtime type information
- TypeName("fixedPlane");
+ TypeName("plane");
// Constructors
//- Construct from components
- fixedPlane
+ plane
(
const word& name,
const dictionary& sDoFRBMCDict
@@ -80,13 +80,13 @@ public:
{
return autoPtr<sixDoFRigidBodyMotionConstraint>
(
- new fixedPlane(*this)
+ new plane(*this)
);
}
//- Destructor
- virtual ~fixedPlane();
+ virtual ~plane();
// Member Functions
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPoint/fixedPoint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
similarity index 77%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPoint/fixedPoint.C
rename to src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
index c0f4bbf311665af81d24f8a07832bebf62c3e562..1068b01af46773777652e2b11b2764cd675fcc59 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPoint/fixedPoint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "fixedPoint.H"
+#include "sixDoFRigidBodyMotionPointConstraint.H"
#include "addToRunTimeSelectionTable.H"
#include "sixDoFRigidBodyMotion.H"
@@ -33,12 +33,12 @@ namespace Foam
{
namespace sixDoFRigidBodyMotionConstraints
{
- defineTypeNameAndDebug(fixedPoint, 0);
+ defineTypeNameAndDebug(point, 0);
addToRunTimeSelectionTable
(
sixDoFRigidBodyMotionConstraint,
- fixedPoint,
+ point,
dictionary
);
}
@@ -47,14 +47,14 @@ namespace sixDoFRigidBodyMotionConstraints
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::sixDoFRigidBodyMotionConstraints::fixedPoint::fixedPoint
+Foam::sixDoFRigidBodyMotionConstraints::point::point
(
const word& name,
const dictionary& sDoFRBMCDict
)
:
sixDoFRigidBodyMotionConstraint(name, sDoFRBMCDict),
- fixedPoint_()
+ point_()
{
read(sDoFRBMCDict);
}
@@ -62,13 +62,13 @@ Foam::sixDoFRigidBodyMotionConstraints::fixedPoint::fixedPoint
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
-Foam::sixDoFRigidBodyMotionConstraints::fixedPoint::~fixedPoint()
+Foam::sixDoFRigidBodyMotionConstraints::point::~point()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-void Foam::sixDoFRigidBodyMotionConstraints::fixedPoint::constrainTranslation
+void Foam::sixDoFRigidBodyMotionConstraints::point::constrainTranslation
(
pointConstraint& pc
) const
@@ -77,33 +77,33 @@ void Foam::sixDoFRigidBodyMotionConstraints::fixedPoint::constrainTranslation
}
-void Foam::sixDoFRigidBodyMotionConstraints::fixedPoint::constrainRotation
+void Foam::sixDoFRigidBodyMotionConstraints::point::constrainRotation
(
pointConstraint& pc
) const
{}
-bool Foam::sixDoFRigidBodyMotionConstraints::fixedPoint::read
+bool Foam::sixDoFRigidBodyMotionConstraints::point::read
(
const dictionary& sDoFRBMCDict
)
{
sixDoFRigidBodyMotionConstraint::read(sDoFRBMCDict);
- sDoFRBMCCoeffs_.lookup("fixedPoint") >> fixedPoint_;
+ sDoFRBMCCoeffs_.lookup("point") >> point_;
return true;
}
-void Foam::sixDoFRigidBodyMotionConstraints::fixedPoint::write
+void Foam::sixDoFRigidBodyMotionConstraints::point::write
(
Ostream& os
) const
{
- os.writeKeyword("fixedPoint")
- << fixedPoint_ << token::END_STATEMENT << nl;
+ os.writeKeyword("point")
+ << point_ << token::END_STATEMENT << nl;
}
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPoint/fixedPoint.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.H
similarity index 89%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPoint/fixedPoint.H
rename to src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.H
index 4745adc8a9e6af28fcb9d5c8778ff54bd7fb23b6..39200c0c5cb9cc3ac2018b5a49199d5ecd4257ea 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/fixedPoint/fixedPoint.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.H
@@ -22,18 +22,18 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::sixDoFRigidBodyMotionConstraints::fixedPoint
+ Foam::sixDoFRigidBodyMotionConstraints::point
Description
Point fixed in space.
SourceFiles
- fixedPoint.C
+ sixDoFRigidBodyMotionPointConstraint.C
\*---------------------------------------------------------------------------*/
-#ifndef fixedPoint_H
-#define fixedPoint_H
+#ifndef sixDoFRigidBodyMotionPointConstraint_H
+#define sixDoFRigidBodyMotionPointConstraint_H
#include "sixDoFRigidBodyMotionConstraint.H"
#include "point.H"
@@ -47,10 +47,10 @@ namespace sixDoFRigidBodyMotionConstraints
{
/*---------------------------------------------------------------------------*\
- Class fixedPoint Declaration
+ Class point Declaration
\*---------------------------------------------------------------------------*/
-class fixedPoint
+class point
:
public sixDoFRigidBodyMotionConstraint
{
@@ -60,19 +60,19 @@ class fixedPoint
// it so that this point remains fixed. This serves as the
// reference point for displacements as well as the target
// position.
- point fixedPoint_;
+ Foam::point point_;
public:
//- Runtime type information
- TypeName("fixedPoint");
+ TypeName("point");
// Constructors
//- Construct from components
- fixedPoint
+ point
(
const word& name,
const dictionary& sDoFRBMCDict
@@ -83,13 +83,13 @@ public:
{
return autoPtr<sixDoFRigidBodyMotionConstraint>
(
- new fixedPoint(*this)
+ new point(*this)
);
}
//- Destructor
- virtual ~fixedPoint();
+ virtual ~point();
// Member Functions
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
index 6a497d4de5abe9bf8407e1c5c2634f98362ea1c1..10044ac8328eddf04e50a89d5575cd1343d88cec 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 31c16f85acdcc2d3e3870aa8378697038371d0f4..6f53b504078fc27d5dc965a2115ccce5e7fa2065 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 b3a013328c2e1c59a490453bfd6f39670fe26c58..99d3728c06eebadf95415a7b33f3a49a9e021ff5 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 e92274c09844e8ce80bae96fcf7e462136851f45..0e9aada9d015dc2e64b743974e1f8ea566837440 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 7063b7a063710d0479dc652b46a886a7e65a9ba5..f517452a80530a2a95962a08f3df092a62723cc0 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
@@ -45,27 +45,21 @@ boundaryField
{
maxIterations 500;
- fixedLine1
+ yLine
{
- sixDoFRigidBodyMotionConstraint fixedLine;
+ sixDoFRigidBodyMotionConstraint line;
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
+ zAxis
{
- sixDoFRigidBodyMotionConstraint fixedAxis;
+ sixDoFRigidBodyMotionConstraint axis;
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 4fad53756a4d1f21464878a4a8856c72de76d64d..82d0874bde90543ffcf993278f47def91518deb9 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 d49af660efa6681a0a87e6ae900ba22907594978..927a3109ec4df3a179ef73e50f75ddf6d9fd122c 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 d49af660efa6681a0a87e6ae900ba22907594978..927a3109ec4df3a179ef73e50f75ddf6d9fd122c 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 d2b845620a516e4b0fe75dac9535d4fae1b436e5..d987171bd14c4204150784600029379bfad7ed7d 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,38 +45,24 @@ 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
{
- maxIterations 500;
-
- fixedAxes1
+ fixedOrientation
{
- sixDoFRigidBodyMotionConstraint fixedOrientation;
- tolerance 1e-6;
- relaxationFactor 1.0;
- fixedOrientationCoeffs {}
+ sixDoFRigidBodyMotionConstraint orientation;
}
- fixedLine1
+ zLine
{
- sixDoFRigidBodyMotionConstraint fixedLine;
- tolerance 1e-6;
- relaxationFactor 1.0;
- fixedLineCoeffs
- {
- refPoint $centreOfMass;
- direction (0 0 1);
- }
+ sixDoFRigidBodyMotionConstraint line;
+ 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 b4afb71442198246bea160a90756a68d8d1d807c..ad68458956fba70dd6b906b5655332099e1cb282 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 1543006b7ac2cf94c682d7432780a0bd0d678615..adb36836efd1eb37c68ccb1e54ef42fc227f638f 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;
}