diff --git a/src/fvMotionSolver/Make/files b/src/fvMotionSolver/Make/files index fc295442b6..fd018a7537 100644 --- a/src/fvMotionSolver/Make/files +++ b/src/fvMotionSolver/Make/files @@ -31,10 +31,10 @@ pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPat pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C -pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyDisplacementPointPatchVectorField.C -pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotion.C -pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionIO.C -pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionState.C -pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionStateIO.C +pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C +pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C +pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C +pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C +pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C LIB = $(FOAM_LIBBIN)/libfvMotionSolvers diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C similarity index 85% rename from src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyDisplacementPointPatchVectorField.C rename to src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C index b5c6b9b8a2..f2a7adb5b6 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "sixDofRigidBodyDisplacementPointPatchVectorField.H" +#include "sixDoFRigidBodyDisplacementPointPatchVectorField.H" #include "pointPatchFields.H" #include "addToRunTimeSelectionTable.H" #include "Time.H" @@ -40,8 +40,8 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -sixDofRigidBodyDisplacementPointPatchVectorField:: -sixDofRigidBodyDisplacementPointPatchVectorField +sixDoFRigidBodyDisplacementPointPatchVectorField:: +sixDoFRigidBodyDisplacementPointPatchVectorField ( const pointPatch& p, const DimensionedField& iF @@ -54,8 +54,8 @@ sixDofRigidBodyDisplacementPointPatchVectorField {} -sixDofRigidBodyDisplacementPointPatchVectorField:: -sixDofRigidBodyDisplacementPointPatchVectorField +sixDoFRigidBodyDisplacementPointPatchVectorField:: +sixDoFRigidBodyDisplacementPointPatchVectorField ( const pointPatch& p, const DimensionedField& iF, @@ -82,10 +82,10 @@ sixDofRigidBodyDisplacementPointPatchVectorField } -sixDofRigidBodyDisplacementPointPatchVectorField:: -sixDofRigidBodyDisplacementPointPatchVectorField +sixDoFRigidBodyDisplacementPointPatchVectorField:: +sixDoFRigidBodyDisplacementPointPatchVectorField ( - const sixDofRigidBodyDisplacementPointPatchVectorField& ptf, + const sixDoFRigidBodyDisplacementPointPatchVectorField& ptf, const pointPatch& p, const DimensionedField& iF, const pointPatchFieldMapper& mapper @@ -98,10 +98,10 @@ sixDofRigidBodyDisplacementPointPatchVectorField {} -sixDofRigidBodyDisplacementPointPatchVectorField:: -sixDofRigidBodyDisplacementPointPatchVectorField +sixDoFRigidBodyDisplacementPointPatchVectorField:: +sixDoFRigidBodyDisplacementPointPatchVectorField ( - const sixDofRigidBodyDisplacementPointPatchVectorField& ptf, + const sixDoFRigidBodyDisplacementPointPatchVectorField& ptf, const DimensionedField& iF ) : @@ -114,7 +114,7 @@ sixDofRigidBodyDisplacementPointPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void sixDofRigidBodyDisplacementPointPatchVectorField::updateCoeffs() +void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs() { if (this->updated()) { @@ -166,7 +166,7 @@ void sixDofRigidBodyDisplacementPointPatchVectorField::updateCoeffs() } -void sixDofRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const +void sixDoFRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const { pointPatchField::write(os); motion_.write(os); @@ -182,7 +182,7 @@ void sixDofRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const makePointPatchTypeField ( pointPatchVectorField, - sixDofRigidBodyDisplacementPointPatchVectorField + sixDoFRigidBodyDisplacementPointPatchVectorField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H similarity index 79% rename from src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyDisplacementPointPatchVectorField.H rename to src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H index 417c56033e..048fa9f14b 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H @@ -23,21 +23,21 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::sixDofRigidBodyDisplacementPointPatchVectorField + Foam::sixDoFRigidBodyDisplacementPointPatchVectorField Description - Foam::sixDofRigidBodyDisplacementPointPatchVectorField + Foam::sixDoFRigidBodyDisplacementPointPatchVectorField SourceFiles - sixDofRigidBodyDisplacementPointPatchVectorField.C + sixDoFRigidBodyDisplacementPointPatchVectorField.C \*---------------------------------------------------------------------------*/ -#ifndef sixDofRigidBodyDisplacementPointPatchVectorField_H -#define sixDofRigidBodyDisplacementPointPatchVectorField_H +#ifndef sixDoFRigidBodyDisplacementPointPatchVectorField_H +#define sixDoFRigidBodyDisplacementPointPatchVectorField_H #include "fixedValuePointPatchField.H" -#include "sixDofRigidBodyMotion.H" +#include "sixDoFRigidBodyMotion.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,17 +45,17 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class sixDofRigidBodyDisplacementPointPatchVectorField Declaration + Class sixDoFRigidBodyDisplacementPointPatchVectorField Declaration \*---------------------------------------------------------------------------*/ -class sixDofRigidBodyDisplacementPointPatchVectorField +class sixDoFRigidBodyDisplacementPointPatchVectorField : public fixedValuePointPatchField { // Private data //- Six dof motion object - sixDofRigidBodyMotion motion_; + sixDoFRigidBodyMotion motion_; //- Reference positions of points on the patch pointField p0_; @@ -68,20 +68,20 @@ class sixDofRigidBodyDisplacementPointPatchVectorField public: //- Runtime type information - TypeName("sixDofRigidBodyDisplacement"); + TypeName("sixDoFRigidBodyDisplacement"); // Constructors //- Construct from patch and internal field - sixDofRigidBodyDisplacementPointPatchVectorField + sixDoFRigidBodyDisplacementPointPatchVectorField ( const pointPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - sixDofRigidBodyDisplacementPointPatchVectorField + sixDoFRigidBodyDisplacementPointPatchVectorField ( const pointPatch&, const DimensionedField&, @@ -89,9 +89,9 @@ public: ); //- Construct by mapping given patchField onto a new patch - sixDofRigidBodyDisplacementPointPatchVectorField + sixDoFRigidBodyDisplacementPointPatchVectorField ( - const sixDofRigidBodyDisplacementPointPatchVectorField&, + const sixDoFRigidBodyDisplacementPointPatchVectorField&, const pointPatch&, const DimensionedField&, const pointPatchFieldMapper& @@ -102,7 +102,7 @@ public: { return autoPtr > ( - new sixDofRigidBodyDisplacementPointPatchVectorField + new sixDoFRigidBodyDisplacementPointPatchVectorField ( *this ) @@ -110,9 +110,9 @@ public: } //- Construct as copy setting internal field reference - sixDofRigidBodyDisplacementPointPatchVectorField + sixDoFRigidBodyDisplacementPointPatchVectorField ( - const sixDofRigidBodyDisplacementPointPatchVectorField&, + const sixDoFRigidBodyDisplacementPointPatchVectorField&, const DimensionedField& ); @@ -124,7 +124,7 @@ public: { return autoPtr > ( - new sixDofRigidBodyDisplacementPointPatchVectorField + new sixDoFRigidBodyDisplacementPointPatchVectorField ( *this, iF diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotion.C b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C similarity index 86% rename from src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotion.C rename to src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C index 5db7351535..dae1ba9f3d 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotion.C +++ b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C @@ -24,11 +24,11 @@ License \*---------------------------------------------------------------------------*/ -#include "sixDofRigidBodyMotion.H" +#include "sixDoFRigidBodyMotion.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::sixDofRigidBodyMotion::sixDofRigidBodyMotion() +Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion() : motionState_(), refCentreOfMass_(vector::zero), @@ -37,7 +37,7 @@ Foam::sixDofRigidBodyMotion::sixDofRigidBodyMotion() {} -Foam::sixDofRigidBodyMotion::sixDofRigidBodyMotion +Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion ( const point& centreOfMass, const tensor& Q, @@ -65,7 +65,7 @@ Foam::sixDofRigidBodyMotion::sixDofRigidBodyMotion {} -Foam::sixDofRigidBodyMotion::sixDofRigidBodyMotion(const dictionary& dict) +Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion(const dictionary& dict) : motionState_(dict), refCentreOfMass_(dict.lookupOrDefault("refCentreOfMass", centreOfMass())), @@ -74,27 +74,27 @@ Foam::sixDofRigidBodyMotion::sixDofRigidBodyMotion(const dictionary& dict) {} -Foam::sixDofRigidBodyMotion::sixDofRigidBodyMotion +Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion ( - const sixDofRigidBodyMotion& sDofRBM + const sixDoFRigidBodyMotion& sDoFRBM ) : - motionState_(sDofRBM.motionState()), - refCentreOfMass_(sDofRBM.refCentreOfMass()), - momentOfInertia_(sDofRBM.momentOfInertia()), - mass_(sDofRBM.mass()) + motionState_(sDoFRBM.motionState()), + refCentreOfMass_(sDoFRBM.refCentreOfMass()), + momentOfInertia_(sDoFRBM.momentOfInertia()), + mass_(sDoFRBM.mass()) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::sixDofRigidBodyMotion::~sixDofRigidBodyMotion() +Foam::sixDoFRigidBodyMotion::~sixDoFRigidBodyMotion() {} // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -void Foam::sixDofRigidBodyMotion::updatePosition +void Foam::sixDoFRigidBodyMotion::updatePosition ( scalar deltaT ) @@ -141,7 +141,7 @@ void Foam::sixDofRigidBodyMotion::updatePosition } -void Foam::sixDofRigidBodyMotion::updateForce +void Foam::sixDoFRigidBodyMotion::updateForce ( const vector& fGlobal, const vector& tauGlobal, @@ -166,7 +166,7 @@ void Foam::sixDofRigidBodyMotion::updateForce } -void Foam::sixDofRigidBodyMotion::updateForce +void Foam::sixDoFRigidBodyMotion::updateForce ( const pointField& positions, const vectorField& forces, @@ -201,7 +201,7 @@ void Foam::sixDofRigidBodyMotion::updateForce Foam::tmp -Foam::sixDofRigidBodyMotion::generatePositions(const pointField& pts) const +Foam::sixDoFRigidBodyMotion::generatePositions(const pointField& pts) const { return (centreOfMass() + (Q() & (pts - refCentreOfMass_))); } diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotion.H b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H similarity index 87% rename from src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotion.H rename to src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H index 3db9d58f6d..a1793c26b6 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotion.H +++ b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::sixDofRigidBodyMotion + Foam::sixDoFRigidBodyMotion Description Six degree of freedom motion for a rigid body. Angular momentum stored in @@ -44,16 +44,16 @@ Description doi = {10.1063/1.474310} SourceFiles - sixDofRigidBodyMotionI.H - sixDofRigidBodyMotion.C - sixDofRigidBodyMotionIO.C + sixDoFRigidBodyMotionI.H + sixDoFRigidBodyMotion.C + sixDoFRigidBodyMotionIO.C \*---------------------------------------------------------------------------*/ -#ifndef sixDofRigidBodyMotion_H -#define sixDofRigidBodyMotion_H +#ifndef sixDoFRigidBodyMotion_H +#define sixDoFRigidBodyMotion_H -#include "sixDofRigidBodyMotionState.H" +#include "sixDoFRigidBodyMotionState.H" #include "pointField.H" #include "mathConstants.H" @@ -67,21 +67,21 @@ class Istream; class Ostream; // Forward declaration of friend functions and operators -class sixDofRigidBodyMotion; -Istream& operator>>(Istream&, sixDofRigidBodyMotion&); -Ostream& operator<<(Ostream&, const sixDofRigidBodyMotion&); +class sixDoFRigidBodyMotion; +Istream& operator>>(Istream&, sixDoFRigidBodyMotion&); +Ostream& operator<<(Ostream&, const sixDoFRigidBodyMotion&); /*---------------------------------------------------------------------------*\ - Class sixDofRigidBodyMotion Declaration + Class sixDoFRigidBodyMotion Declaration \*---------------------------------------------------------------------------*/ -class sixDofRigidBodyMotion +class sixDoFRigidBodyMotion { // Private data // state data object - sixDofRigidBodyMotionState motionState_; + sixDoFRigidBodyMotionState motionState_; //- Centre of mass of reference state point refCentreOfMass_; @@ -113,10 +113,10 @@ public: // Constructors //- Construct null - sixDofRigidBodyMotion(); + sixDoFRigidBodyMotion(); //- Construct from components - sixDofRigidBodyMotion + sixDoFRigidBodyMotion ( const point& centreOfMass, const tensor& Q, @@ -130,14 +130,14 @@ public: ); //- Construct from dictionary - sixDofRigidBodyMotion(const dictionary& dict); + sixDoFRigidBodyMotion(const dictionary& dict); //- Construct as copy - sixDofRigidBodyMotion(const sixDofRigidBodyMotion&); + sixDoFRigidBodyMotion(const sixDoFRigidBodyMotion&); //- Destructor - ~sixDofRigidBodyMotion(); + ~sixDoFRigidBodyMotion(); // Member Functions @@ -166,7 +166,7 @@ public: // Access //- Return access to the motion state - inline const sixDofRigidBodyMotionState& motionState() const; + inline const sixDoFRigidBodyMotionState& motionState() const; //- Return access to the centre of mass inline const point& centreOfMass() const; @@ -232,8 +232,8 @@ public: // IOstream Operators - friend Istream& operator>>(Istream&, sixDofRigidBodyMotion&); - friend Ostream& operator<<(Ostream&, const sixDofRigidBodyMotion&); + friend Istream& operator>>(Istream&, sixDoFRigidBodyMotion&); + friend Ostream& operator<<(Ostream&, const sixDoFRigidBodyMotion&); }; @@ -243,7 +243,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "sixDofRigidBodyMotionI.H" +#include "sixDoFRigidBodyMotionI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionI.H b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionI.H similarity index 66% rename from src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionI.H rename to src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionI.H index 2ce3160b01..aeb75bdea4 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionI.H +++ b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionI.H @@ -29,7 +29,7 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // inline Foam::tensor -Foam::sixDofRigidBodyMotion::rotationTensorX(scalar phi) const +Foam::sixDoFRigidBodyMotion::rotationTensorX(scalar phi) const { return tensor ( @@ -41,7 +41,7 @@ Foam::sixDofRigidBodyMotion::rotationTensorX(scalar phi) const inline Foam::tensor -Foam::sixDofRigidBodyMotion::rotationTensorY(scalar phi) const +Foam::sixDoFRigidBodyMotion::rotationTensorY(scalar phi) const { return tensor ( @@ -53,7 +53,7 @@ Foam::sixDofRigidBodyMotion::rotationTensorY(scalar phi) const inline Foam::tensor -Foam::sixDofRigidBodyMotion::rotationTensorZ(scalar phi) const +Foam::sixDoFRigidBodyMotion::rotationTensorZ(scalar phi) const { return tensor ( @@ -64,117 +64,117 @@ Foam::sixDofRigidBodyMotion::rotationTensorZ(scalar phi) const } -inline const Foam::sixDofRigidBodyMotionState& -Foam::sixDofRigidBodyMotion::motionState() const +inline const Foam::sixDoFRigidBodyMotionState& +Foam::sixDoFRigidBodyMotion::motionState() const { return motionState_; } -inline const Foam::point& Foam::sixDofRigidBodyMotion::centreOfMass() const +inline const Foam::point& Foam::sixDoFRigidBodyMotion::centreOfMass() const { return motionState_.centreOfMass(); } -inline const Foam::point& Foam::sixDofRigidBodyMotion::refCentreOfMass() const +inline const Foam::point& Foam::sixDoFRigidBodyMotion::refCentreOfMass() const { return refCentreOfMass_; } inline const Foam::diagTensor& -Foam::sixDofRigidBodyMotion::momentOfInertia() const +Foam::sixDoFRigidBodyMotion::momentOfInertia() const { return momentOfInertia_; } -inline Foam::scalar Foam::sixDofRigidBodyMotion::mass() const +inline Foam::scalar Foam::sixDoFRigidBodyMotion::mass() const { return mass_; } -inline const Foam::tensor& Foam::sixDofRigidBodyMotion::Q() const +inline const Foam::tensor& Foam::sixDoFRigidBodyMotion::Q() const { return motionState_.Q(); } -inline const Foam::vector& Foam::sixDofRigidBodyMotion::v() const +inline const Foam::vector& Foam::sixDoFRigidBodyMotion::v() const { return motionState_.v(); } -inline const Foam::vector& Foam::sixDofRigidBodyMotion::a() const +inline const Foam::vector& Foam::sixDoFRigidBodyMotion::a() const { return motionState_.a(); } -inline const Foam::vector& Foam::sixDofRigidBodyMotion::pi() const +inline const Foam::vector& Foam::sixDoFRigidBodyMotion::pi() const { return motionState_.pi(); } -inline const Foam::vector& Foam::sixDofRigidBodyMotion::tau() const +inline const Foam::vector& Foam::sixDoFRigidBodyMotion::tau() const { return motionState_.tau(); } -inline Foam::point& Foam::sixDofRigidBodyMotion::centreOfMass() +inline Foam::point& Foam::sixDoFRigidBodyMotion::centreOfMass() { return motionState_.centreOfMass(); } -inline Foam::point& Foam::sixDofRigidBodyMotion::refCentreOfMass() +inline Foam::point& Foam::sixDoFRigidBodyMotion::refCentreOfMass() { return refCentreOfMass_; } -inline Foam::diagTensor& Foam::sixDofRigidBodyMotion::momentOfInertia() +inline Foam::diagTensor& Foam::sixDoFRigidBodyMotion::momentOfInertia() { return momentOfInertia_; } -inline Foam::scalar& Foam::sixDofRigidBodyMotion::mass() +inline Foam::scalar& Foam::sixDoFRigidBodyMotion::mass() { return mass_; } -inline Foam::tensor& Foam::sixDofRigidBodyMotion::Q() +inline Foam::tensor& Foam::sixDoFRigidBodyMotion::Q() { return motionState_.Q(); } -inline Foam::vector& Foam::sixDofRigidBodyMotion::v() +inline Foam::vector& Foam::sixDoFRigidBodyMotion::v() { return motionState_.v(); } -inline Foam::vector& Foam::sixDofRigidBodyMotion::a() +inline Foam::vector& Foam::sixDoFRigidBodyMotion::a() { return motionState_.a(); } -inline Foam::vector& Foam::sixDofRigidBodyMotion::pi() +inline Foam::vector& Foam::sixDoFRigidBodyMotion::pi() { return motionState_.pi(); } -inline Foam::vector& Foam::sixDofRigidBodyMotion::tau() +inline Foam::vector& Foam::sixDoFRigidBodyMotion::tau() { return motionState_.tau(); } diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionIO.C b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C similarity index 77% rename from src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionIO.C rename to src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C index fe4902a94d..005cbbe6aa 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionIO.C +++ b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C @@ -24,12 +24,12 @@ License \*---------------------------------------------------------------------------*/ -#include "sixDofRigidBodyMotion.H" +#include "sixDoFRigidBodyMotion.H" #include "IOstreams.H" // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -void Foam::sixDofRigidBodyMotion::write(Ostream& os) const +void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const { motionState_.write(os); @@ -44,18 +44,18 @@ void Foam::sixDofRigidBodyMotion::write(Ostream& os) const // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // -Foam::Istream& Foam::operator>>(Istream& is, sixDofRigidBodyMotion& sDofRBM) +Foam::Istream& Foam::operator>>(Istream& is, sixDoFRigidBodyMotion& sDoFRBM) { - is >> sDofRBM.motionState_ - >> sDofRBM.refCentreOfMass_ - >> sDofRBM.momentOfInertia_ - >> sDofRBM.mass_; + is >> sDoFRBM.motionState_ + >> sDoFRBM.refCentreOfMass_ + >> sDoFRBM.momentOfInertia_ + >> sDoFRBM.mass_; // Check state of Istream is.check ( "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::sixDofRigidBodyMotion&)" + "(Foam::Istream&, Foam::sixDoFRigidBodyMotion&)" ); return is; @@ -65,19 +65,19 @@ Foam::Istream& Foam::operator>>(Istream& is, sixDofRigidBodyMotion& sDofRBM) Foam::Ostream& Foam::operator<< ( Ostream& os, - const sixDofRigidBodyMotion& sDofRBM + const sixDoFRigidBodyMotion& sDoFRBM ) { - os << sDofRBM.motionState() - << token::SPACE << sDofRBM.refCentreOfMass() - << token::SPACE << sDofRBM.momentOfInertia() - << token::SPACE << sDofRBM.mass() ; + os << sDoFRBM.motionState() + << token::SPACE << sDoFRBM.refCentreOfMass() + << token::SPACE << sDoFRBM.momentOfInertia() + << token::SPACE << sDoFRBM.mass() ; // Check state of Ostream os.check ( "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::sixDofRigidBodyMotion&)" + "const Foam::sixDoFRigidBodyMotion&)" ); return os; diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionState.C b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C similarity index 79% rename from src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionState.C rename to src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C index 5d54079099..cd52b1d142 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionState.C +++ b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C @@ -24,11 +24,11 @@ License \*---------------------------------------------------------------------------*/ -#include "sixDofRigidBodyMotionState.H" +#include "sixDoFRigidBodyMotionState.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::sixDofRigidBodyMotionState::sixDofRigidBodyMotionState() +Foam::sixDoFRigidBodyMotionState::sixDoFRigidBodyMotionState() : centreOfMass_(vector::zero), Q_(I), @@ -39,7 +39,7 @@ Foam::sixDofRigidBodyMotionState::sixDofRigidBodyMotionState() {} -Foam::sixDofRigidBodyMotionState::sixDofRigidBodyMotionState +Foam::sixDoFRigidBodyMotionState::sixDoFRigidBodyMotionState ( const point& centreOfMass, const tensor& Q, @@ -58,7 +58,7 @@ Foam::sixDofRigidBodyMotionState::sixDofRigidBodyMotionState {} -Foam::sixDofRigidBodyMotionState::sixDofRigidBodyMotionState +Foam::sixDoFRigidBodyMotionState::sixDoFRigidBodyMotionState ( const dictionary& dict ) @@ -72,23 +72,23 @@ Foam::sixDofRigidBodyMotionState::sixDofRigidBodyMotionState {} -Foam::sixDofRigidBodyMotionState::sixDofRigidBodyMotionState +Foam::sixDoFRigidBodyMotionState::sixDoFRigidBodyMotionState ( - const sixDofRigidBodyMotionState& sDofRBMS + const sixDoFRigidBodyMotionState& sDoFRBMS ) : - centreOfMass_(sDofRBMS.centreOfMass()), - Q_(sDofRBMS.Q()), - v_(sDofRBMS.v()), - a_(sDofRBMS.a()), - pi_(sDofRBMS.pi()), - tau_(sDofRBMS.tau()) + centreOfMass_(sDoFRBMS.centreOfMass()), + Q_(sDoFRBMS.Q()), + v_(sDoFRBMS.v()), + a_(sDoFRBMS.a()), + pi_(sDoFRBMS.pi()), + tau_(sDoFRBMS.tau()) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::sixDofRigidBodyMotionState::~sixDofRigidBodyMotionState() +Foam::sixDoFRigidBodyMotionState::~sixDoFRigidBodyMotionState() {} diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionState.H b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H similarity index 83% rename from src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionState.H rename to src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H index f7942e31bd..32cf0be02b 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionState.H +++ b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H @@ -23,22 +23,22 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::sixDofRigidBodyMotionState + Foam::sixDoFRigidBodyMotionState Description - Holds the motion state of sixDof object. Wrapped up together + Holds the motion state of sixDoF object. Wrapped up together to allow rapid scatter to other processors. The processors must all maintain exactly the same state data to avoid any drift or inconsistency. SourceFiles - sixDofRigidBodyMotionStateI.H - sixDofRigidBodyMotionState.C - sixDofRigidBodyMotionStateIO.C + sixDoFRigidBodyMotionStateI.H + sixDoFRigidBodyMotionState.C + sixDoFRigidBodyMotionStateIO.C \*---------------------------------------------------------------------------*/ -#ifndef sixDofRigidBodyMotionState_H -#define sixDofRigidBodyMotionState_H +#ifndef sixDoFRigidBodyMotionState_H +#define sixDoFRigidBodyMotionState_H #include "vector.H" #include "point.H" @@ -56,16 +56,16 @@ class Istream; class Ostream; // Forward declaration of friend functions and operators -class sixDofRigidBodyMotionState; -Istream& operator>>(Istream&, sixDofRigidBodyMotionState&); -Ostream& operator<<(Ostream&, const sixDofRigidBodyMotionState&); +class sixDoFRigidBodyMotionState; +Istream& operator>>(Istream&, sixDoFRigidBodyMotionState&); +Ostream& operator<<(Ostream&, const sixDoFRigidBodyMotionState&); /*---------------------------------------------------------------------------*\ - Class sixDofRigidBodyMotionState Declaration + Class sixDoFRigidBodyMotionState Declaration \*---------------------------------------------------------------------------*/ -class sixDofRigidBodyMotionState +class sixDoFRigidBodyMotionState { // Private data @@ -96,10 +96,10 @@ public: // Constructors //- Construct null - sixDofRigidBodyMotionState(); + sixDoFRigidBodyMotionState(); //- Construct from components - sixDofRigidBodyMotionState + sixDoFRigidBodyMotionState ( const point& centreOfMass, const tensor& Q, @@ -110,14 +110,14 @@ public: ); //- Construct from dictionary - sixDofRigidBodyMotionState(const dictionary& dict); + sixDoFRigidBodyMotionState(const dictionary& dict); //- Construct as copy - sixDofRigidBodyMotionState(const sixDofRigidBodyMotionState&); + sixDoFRigidBodyMotionState(const sixDoFRigidBodyMotionState&); //- Destructor - ~sixDofRigidBodyMotionState(); + ~sixDoFRigidBodyMotionState(); // Member Functions @@ -174,8 +174,8 @@ public: // IOstream Operators - friend Istream& operator>>(Istream&, sixDofRigidBodyMotionState&); - friend Ostream& operator<<(Ostream&, const sixDofRigidBodyMotionState&); + friend Istream& operator>>(Istream&, sixDoFRigidBodyMotionState&); + friend Ostream& operator<<(Ostream&, const sixDoFRigidBodyMotionState&); }; @@ -185,7 +185,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "sixDofRigidBodyMotionStateI.H" +#include "sixDoFRigidBodyMotionStateI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionStateI.H b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateI.H similarity index 70% rename from src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionStateI.H rename to src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateI.H index dff9412fba..dc6659d0cd 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionStateI.H +++ b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateI.H @@ -27,73 +27,73 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -inline const Foam::point& Foam::sixDofRigidBodyMotionState::centreOfMass() const +inline const Foam::point& Foam::sixDoFRigidBodyMotionState::centreOfMass() const { return centreOfMass_; } -inline const Foam::tensor& Foam::sixDofRigidBodyMotionState::Q() const +inline const Foam::tensor& Foam::sixDoFRigidBodyMotionState::Q() const { return Q_; } -inline const Foam::vector& Foam::sixDofRigidBodyMotionState::v() const +inline const Foam::vector& Foam::sixDoFRigidBodyMotionState::v() const { return v_; } -inline const Foam::vector& Foam::sixDofRigidBodyMotionState::a() const +inline const Foam::vector& Foam::sixDoFRigidBodyMotionState::a() const { return a_; } -inline const Foam::vector& Foam::sixDofRigidBodyMotionState::pi() const +inline const Foam::vector& Foam::sixDoFRigidBodyMotionState::pi() const { return pi_; } -inline const Foam::vector& Foam::sixDofRigidBodyMotionState::tau() const +inline const Foam::vector& Foam::sixDoFRigidBodyMotionState::tau() const { return tau_; } -inline Foam::point& Foam::sixDofRigidBodyMotionState::centreOfMass() +inline Foam::point& Foam::sixDoFRigidBodyMotionState::centreOfMass() { return centreOfMass_; } -inline Foam::tensor& Foam::sixDofRigidBodyMotionState::Q() +inline Foam::tensor& Foam::sixDoFRigidBodyMotionState::Q() { return Q_; } -inline Foam::vector& Foam::sixDofRigidBodyMotionState::v() +inline Foam::vector& Foam::sixDoFRigidBodyMotionState::v() { return v_; } -inline Foam::vector& Foam::sixDofRigidBodyMotionState::a() +inline Foam::vector& Foam::sixDoFRigidBodyMotionState::a() { return a_; } -inline Foam::vector& Foam::sixDofRigidBodyMotionState::pi() +inline Foam::vector& Foam::sixDoFRigidBodyMotionState::pi() { return pi_; } -inline Foam::vector& Foam::sixDofRigidBodyMotionState::tau() +inline Foam::vector& Foam::sixDoFRigidBodyMotionState::tau() { return tau_; } diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionStateIO.C b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C similarity index 75% rename from src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionStateIO.C rename to src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C index 3934e57cf2..650a359991 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/sixDofRigidBodyDisplacement/sixDofRigidBodyMotion/sixDofRigidBodyMotionStateIO.C +++ b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C @@ -24,12 +24,12 @@ License \*---------------------------------------------------------------------------*/ -#include "sixDofRigidBodyMotionState.H" +#include "sixDoFRigidBodyMotionState.H" #include "IOstreams.H" // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -void Foam::sixDofRigidBodyMotionState::write(Ostream& os) const +void Foam::sixDoFRigidBodyMotionState::write(Ostream& os) const { os.writeKeyword("centreOfMass") << centreOfMass_ << token::END_STATEMENT << nl; @@ -50,21 +50,21 @@ void Foam::sixDofRigidBodyMotionState::write(Ostream& os) const Foam::Istream& Foam::operator>> ( - Istream& is, sixDofRigidBodyMotionState& sDofRBMS + Istream& is, sixDoFRigidBodyMotionState& sDoFRBMS ) { - is >> sDofRBMS.centreOfMass_ - >> sDofRBMS.Q_ - >> sDofRBMS.v_ - >> sDofRBMS.a_ - >> sDofRBMS.pi_ - >> sDofRBMS.tau_; + is >> sDoFRBMS.centreOfMass_ + >> sDoFRBMS.Q_ + >> sDoFRBMS.v_ + >> sDoFRBMS.a_ + >> sDoFRBMS.pi_ + >> sDoFRBMS.tau_; // Check state of Istream is.check ( "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::sixDofRigidBodyMotionState&)" + "(Foam::Istream&, Foam::sixDoFRigidBodyMotionState&)" ); return is; @@ -74,21 +74,21 @@ Foam::Istream& Foam::operator>> Foam::Ostream& Foam::operator<< ( Ostream& os, - const sixDofRigidBodyMotionState& sDofRBMS + const sixDoFRigidBodyMotionState& sDoFRBMS ) { - os << token::SPACE << sDofRBMS.centreOfMass() - << token::SPACE << sDofRBMS.Q() - << token::SPACE << sDofRBMS.v() - << token::SPACE << sDofRBMS.a() - << token::SPACE << sDofRBMS.pi() - << token::SPACE << sDofRBMS.tau(); + os << token::SPACE << sDoFRBMS.centreOfMass() + << token::SPACE << sDoFRBMS.Q() + << token::SPACE << sDoFRBMS.v() + << token::SPACE << sDoFRBMS.a() + << token::SPACE << sDoFRBMS.pi() + << token::SPACE << sDoFRBMS.tau(); // Check state of Ostream os.check ( "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::sixDofRigidBodyMotionState&)" + "const Foam::sixDoFRigidBodyMotionState&)" ); return os;