diff --git a/src/dynamicFvMesh/Make/files b/src/dynamicFvMesh/Make/files index 4bd6e629813549029b5becaf6150c0549cb82119..84749dfcaa5ee6e79b0318e0d014bcd0dfc978ad 100644 --- a/src/dynamicFvMesh/Make/files +++ b/src/dynamicFvMesh/Make/files @@ -12,9 +12,9 @@ $(solidBodyMotionFunctions)/solidBodyMotionFunction/newSolidBodyMotionFunction.C $(solidBodyMotionFunctions)/SDA/SDA.C $(solidBodyMotionFunctions)/SKA/SKA.C $(solidBodyMotionFunctions)/linearMotion/linearMotion.C -$(solidBodyMotionFunctions)/rotationMotion/rotationMotion.C +$(solidBodyMotionFunctions)/rotatingMotion/rotatingMotion.C $(solidBodyMotionFunctions)/multiMotion/multiMotion.C -$(solidBodyMotionFunctions)/oscillatingMotion/oscillatingMotion.C -$(solidBodyMotionFunctions)/rockingMotion/rockingMotion.C +$(solidBodyMotionFunctions)/oscillatingLinearMotion/oscillatingLinearMotion.C +$(solidBodyMotionFunctions)/oscillatingRotatingMotion/oscillatingRotatingMotion.C LIB = $(FOAM_LIBBIN)/libdynamicFvMesh diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingMotion/oscillatingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C similarity index 82% rename from src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingMotion/oscillatingMotion.C rename to src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C index 946b26a32d60c9a09c547161634b2e4dcc53b728..c662b59d9f59ed8660972aaed09e980748ca2128 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingMotion/oscillatingMotion.C +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "oscillatingMotion.H" +#include "oscillatingLinearMotion.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -33,11 +33,11 @@ namespace Foam { namespace solidBodyMotionFunctions { - defineTypeNameAndDebug(oscillatingMotion, 0); + defineTypeNameAndDebug(oscillatingLinearMotion, 0); addToRunTimeSelectionTable ( solidBodyMotionFunction, - oscillatingMotion, + oscillatingLinearMotion, dictionary ); }; @@ -46,7 +46,7 @@ namespace solidBodyMotionFunctions // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::solidBodyMotionFunctions::oscillatingMotion::oscillatingMotion +Foam::solidBodyMotionFunctions::oscillatingLinearMotion::oscillatingLinearMotion ( const dictionary& SBMFCoeffs, const Time& runTime @@ -60,14 +60,14 @@ Foam::solidBodyMotionFunctions::oscillatingMotion::oscillatingMotion // * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * // -Foam::solidBodyMotionFunctions::oscillatingMotion::~oscillatingMotion() +Foam::solidBodyMotionFunctions::oscillatingLinearMotion::~oscillatingLinearMotion() {} // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // Foam::septernion -Foam::solidBodyMotionFunctions::oscillatingMotion::transformation() const +Foam::solidBodyMotionFunctions::oscillatingLinearMotion::transformation() const { scalar t = time_.value(); @@ -76,14 +76,14 @@ Foam::solidBodyMotionFunctions::oscillatingMotion::transformation() const quaternion R(0, 0, 0); septernion TR(septernion(displacement)*R); - Info<< "solidBodyMotionFunctions::oscillatingMotion::transformation(): " + Info<< "solidBodyMotionFunctions::oscillatingLinearMotion::transformation(): " << "Time = " << t << " transformation: " << TR << endl; return TR; } -bool Foam::solidBodyMotionFunctions::oscillatingMotion::read +bool Foam::solidBodyMotionFunctions::oscillatingLinearMotion::read ( const dictionary& SBMFCoeffs ) diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingMotion/oscillatingMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H similarity index 84% rename from src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingMotion/oscillatingMotion.H rename to src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H index d416652be1af26322a4aec9f288cbadd20fbabea..9d4079f4ce97b66e03ec540c37b051dc876331ff 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingMotion/oscillatingMotion.H +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H @@ -23,18 +23,18 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::solidBodyMotionFunctions::oscillatingMotion + Foam::solidBodyMotionFunctions::oscillatingLinearMotion Description SolidBodyMotionFvMesh 6DoF motion function. Oscillating displacement. SourceFiles - oscillatingMotion.C + oscillatingLinearMotion.C \*---------------------------------------------------------------------------*/ -#ifndef oscillatingMotion_H -#define oscillatingMotion_H +#ifndef oscillatingLinearMotion_H +#define oscillatingLinearMotion_H #include "solidBodyMotionFunction.H" #include "primitiveFields.H" @@ -48,10 +48,10 @@ namespace solidBodyMotionFunctions { /*---------------------------------------------------------------------------*\ - Class oscillatingMotion Declaration + Class oscillatingLinearMotion Declaration \*---------------------------------------------------------------------------*/ -class oscillatingMotion +class oscillatingLinearMotion : public solidBodyMotionFunction { @@ -67,22 +67,22 @@ class oscillatingMotion // Private Member Functions //- Disallow copy construct - oscillatingMotion(const oscillatingMotion&); + oscillatingLinearMotion(const oscillatingLinearMotion&); //- Disallow default bitwise assignment - void operator=(const oscillatingMotion&); + void operator=(const oscillatingLinearMotion&); public: //- Runtime type information - TypeName("oscillatingMotion"); + TypeName("oscillatingLinearMotion"); // Constructors //- Construct from components - oscillatingMotion + oscillatingLinearMotion ( const dictionary& SBMFCoeffs, const Time& runTime @@ -91,7 +91,7 @@ public: // Destructor - virtual ~oscillatingMotion(); + virtual ~oscillatingLinearMotion(); // Member Functions diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rockingMotion/rockingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C similarity index 83% rename from src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rockingMotion/rockingMotion.C rename to src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C index c6a734383242579a55071524d582921273dd246c..1e6ddffb12e23a81519a47ef1725b49f052303ab 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rockingMotion/rockingMotion.C +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "rockingMotion.H" +#include "oscillatingRotatingMotion.H" #include "addToRunTimeSelectionTable.H" #include "mathConstants.H" @@ -36,11 +36,11 @@ namespace Foam { namespace solidBodyMotionFunctions { - defineTypeNameAndDebug(rockingMotion, 0); + defineTypeNameAndDebug(oscillatingRotatingMotion, 0); addToRunTimeSelectionTable ( solidBodyMotionFunction, - rockingMotion, + oscillatingRotatingMotion, dictionary ); }; @@ -49,7 +49,7 @@ namespace solidBodyMotionFunctions // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::solidBodyMotionFunctions::rockingMotion::rockingMotion +Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::oscillatingRotatingMotion ( const dictionary& SBMFCoeffs, const Time& runTime @@ -63,14 +63,14 @@ Foam::solidBodyMotionFunctions::rockingMotion::rockingMotion // * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * // -Foam::solidBodyMotionFunctions::rockingMotion::~rockingMotion() +Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::~oscillatingRotatingMotion() {} // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // Foam::septernion -Foam::solidBodyMotionFunctions::rockingMotion::transformation() const +Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::transformation() const { scalar t = time_.value(); @@ -82,14 +82,14 @@ Foam::solidBodyMotionFunctions::rockingMotion::transformation() const quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z()); septernion TR(septernion(CofG_)*R*septernion(-CofG_)); - Info<< "solidBodyMotionFunctions::rockingMotion::transformation(): " + Info<< "solidBodyMotionFunctions::oscillatingRotatingMotion::transformation(): " << "Time = " << t << " transformation: " << TR << endl; return TR; } -bool Foam::solidBodyMotionFunctions::rockingMotion::read +bool Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::read ( const dictionary& SBMFCoeffs ) diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rockingMotion/rockingMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H similarity index 84% rename from src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rockingMotion/rockingMotion.H rename to src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H index ca372047fa917d7b9a35eca75188efc7fb6c4d83..253c7df64d44a3d9327530f952bd6e6355e2c84c 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rockingMotion/rockingMotion.H +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H @@ -23,18 +23,18 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::solidBodyMotionFunctions::rockingMotion + Foam::solidBodyMotionFunctions::oscillatingRotatingMotion Description SolidBodyMotionFvMesh 6DoF motion function. Oscillating rotation. SourceFiles - rockingMotion.C + oscillatingRotatingMotion.C \*---------------------------------------------------------------------------*/ -#ifndef rockingMotion_H -#define rockingMotion_H +#ifndef oscillatingRotatingMotion_H +#define oscillatingRotatingMotion_H #include "solidBodyMotionFunction.H" #include "primitiveFields.H" @@ -48,10 +48,10 @@ namespace solidBodyMotionFunctions { /*---------------------------------------------------------------------------*\ - Class rockingMotion Declaration + Class oscillatingRotatingMotion Declaration \*---------------------------------------------------------------------------*/ -class rockingMotion +class oscillatingRotatingMotion : public solidBodyMotionFunction { @@ -70,22 +70,22 @@ class rockingMotion // Private Member Functions //- Disallow copy construct - rockingMotion(const rockingMotion&); + oscillatingRotatingMotion(const oscillatingRotatingMotion&); //- Disallow default bitwise assignment - void operator=(const rockingMotion&); + void operator=(const oscillatingRotatingMotion&); public: //- Runtime type information - TypeName("rockingMotion"); + TypeName("oscillatingRotatingMotion"); // Constructors //- Construct from components - rockingMotion + oscillatingRotatingMotion ( const dictionary& SBMFCoeffs, const Time& runTime @@ -94,7 +94,7 @@ public: // Destructor - virtual ~rockingMotion(); + virtual ~oscillatingRotatingMotion(); // Member Functions diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotationMotion/rotationMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C similarity index 86% rename from src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotationMotion/rotationMotion.C rename to src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C index d6a2131f0c1df15ebae94e964460d4377ba22557..467af4973c9fc97f0472e6a8799f07210e8101cb 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotationMotion/rotationMotion.C +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "rotationMotion.H" +#include "rotatingMotion.H" #include "addToRunTimeSelectionTable.H" #include "mathConstants.H" @@ -36,11 +36,11 @@ namespace Foam { namespace solidBodyMotionFunctions { - defineTypeNameAndDebug(rotationMotion, 0); + defineTypeNameAndDebug(rotatingMotion, 0); addToRunTimeSelectionTable ( solidBodyMotionFunction, - rotationMotion, + rotatingMotion, dictionary ); }; @@ -49,7 +49,7 @@ namespace solidBodyMotionFunctions // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::solidBodyMotionFunctions::rotationMotion::rotationMotion +Foam::solidBodyMotionFunctions::rotatingMotion::rotatingMotion ( const dictionary& SBMFCoeffs, const Time& runTime @@ -63,14 +63,14 @@ Foam::solidBodyMotionFunctions::rotationMotion::rotationMotion // * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * // -Foam::solidBodyMotionFunctions::rotationMotion::~rotationMotion() +Foam::solidBodyMotionFunctions::rotatingMotion::~rotatingMotion() {} // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // Foam::septernion -Foam::solidBodyMotionFunctions::rotationMotion::transformation() const +Foam::solidBodyMotionFunctions::rotatingMotion::transformation() const { scalar t = time_.value(); @@ -85,14 +85,14 @@ Foam::solidBodyMotionFunctions::rotationMotion::transformation() const quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z()); septernion TR(septernion(CofG_)*R*septernion(-CofG_)); - Info<< "solidBodyMotionFunctions::rotationMotion::transformation(): " + Info<< "solidBodyMotionFunctions::rotatingMotion::transformation(): " << "Time = " << t << " transformation: " << TR << endl; return TR; } -bool Foam::solidBodyMotionFunctions::rotationMotion::read +bool Foam::solidBodyMotionFunctions::rotatingMotion::read ( const dictionary& SBMFCoeffs ) diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotationMotion/rotationMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H similarity index 87% rename from src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotationMotion/rotationMotion.H rename to src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H index 27ea7a6d18d78f23ed95b0d7e93900380032d70a..da38f673688934f443f4a8e24f903494de68aee3 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotationMotion/rotationMotion.H +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H @@ -23,19 +23,19 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::solidBodyMotionFunctions::rotationMotion + Foam::solidBodyMotionFunctions::rotatingMotion Description SolidBodyMotionFvMesh 6DoF motion function. Constant velocity rotation around CoG. SourceFiles - rotationMotion.C + rotatingMotion.C \*---------------------------------------------------------------------------*/ -#ifndef rotationMotion_H -#define rotationMotion_H +#ifndef rotatingMotion_H +#define rotatingMotion_H #include "solidBodyMotionFunction.H" #include "primitiveFields.H" @@ -49,10 +49,10 @@ namespace solidBodyMotionFunctions { /*---------------------------------------------------------------------------*\ - Class rotationMotion Declaration + Class rotatingMotion Declaration \*---------------------------------------------------------------------------*/ -class rotationMotion +class rotatingMotion : public solidBodyMotionFunction { @@ -68,22 +68,22 @@ class rotationMotion // Private Member Functions //- Disallow copy construct - rotationMotion(const rotationMotion&); + rotatingMotion(const rotatingMotion&); //- Disallow default bitwise assignment - void operator=(const rotationMotion&); + void operator=(const rotatingMotion&); public: //- Runtime type information - TypeName("rotationMotion"); + TypeName("rotatingMotion"); // Constructors //- Construct from components - rotationMotion + rotatingMotion ( const dictionary& SBMFCoeffs, const Time& runTime @@ -92,7 +92,7 @@ public: // Destructor - virtual ~rotationMotion(); + virtual ~rotatingMotion(); // Member Functions