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/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/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
index 3714898106cf1149c7e9ff34911825d8d6f4d847..f517452a80530a2a95962a08f3df092a62723cc0 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
@@ -45,18 +45,18 @@ boundaryField
{
maxIterations 500;
- fixedLine1
+ yLine
{
- sixDoFRigidBodyMotionConstraint fixedLine;
+ sixDoFRigidBodyMotionConstraint line;
tolerance 1e-9;
relaxationFactor 0.7;
refPoint (0.25 0.007 0.125);
direction (0 1 0);
}
- fixedAxis1
+ zAxis
{
- sixDoFRigidBodyMotionConstraint fixedAxis;
+ sixDoFRigidBodyMotionConstraint axis;
tolerance 1e-06;
relaxationFactor 0.7;
axis (0 0 1);
diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement
index cf2872d0b1d1a547fe6daa6375c3bc259247954a..d987171bd14c4204150784600029379bfad7ed7d 100644
--- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement
+++ b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement
@@ -54,14 +54,14 @@ boundaryField
}
constraints
{
- fixedAxes1
+ fixedOrientation
{
- sixDoFRigidBodyMotionConstraint fixedOrientation;
+ sixDoFRigidBodyMotionConstraint orientation;
}
- fixedLine1
+ zLine
{
- sixDoFRigidBodyMotionConstraint fixedLine;
+ sixDoFRigidBodyMotionConstraint line;
direction (0 0 1);
}
}