zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

renaming of solidBodyMotionFunctions

Browse Source
This commit is contained in:
mattijs
2009-10-09 13:43:37 +01:00
parent 5ecde8d92e
commit 4ed11a6c23
7 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dynamicFvMesh/Make/files
View File

@ -12,9 +12,9 @@ $(solidBodyMotionFunctions)/solidBodyMotionFunction/newSolidBodyMotionFunction.C
$(solidBodyMotionFunctions)/SDA/SDA.C $(solidBodyMotionFunctions)/SDA/SDA.C
$(solidBodyMotionFunctions)/SKA/SKA.C $(solidBodyMotionFunctions)/SKA/SKA.C
$(solidBodyMotionFunctions)/linearMotion/linearMotion.C $(solidBodyMotionFunctions)/linearMotion/linearMotion.C
$(solidBodyMotionFunctions)/rotationMotion/rotationMotion.C $(solidBodyMotionFunctions)/rotatingMotion/rotatingMotion.C
$(solidBodyMotionFunctions)/multiMotion/multiMotion.C $(solidBodyMotionFunctions)/multiMotion/multiMotion.C
$(solidBodyMotionFunctions)/oscillatingMotion/oscillatingMotion.C $(solidBodyMotionFunctions)/oscillatingLinearMotion/oscillatingLinearMotion.C
$(solidBodyMotionFunctions)/rockingMotion/rockingMotion.C $(solidBodyMotionFunctions)/oscillatingRotatingMotion/oscillatingRotatingMotion.C
LIB = $(FOAM_LIBBIN)/libdynamicFvMesh LIB = $(FOAM_LIBBIN)/libdynamicFvMesh

16
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingMotion/oscillatingMotion.C → src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "oscillatingMotion.H" #include "oscillatingLinearMotion.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -33,11 +33,11 @@ namespace Foam
{ {
namespace solidBodyMotionFunctions namespace solidBodyMotionFunctions
{ {
defineTypeNameAndDebug(oscillatingMotion, 0); defineTypeNameAndDebug(oscillatingLinearMotion, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
( (
solidBodyMotionFunction, solidBodyMotionFunction,
oscillatingMotion, oscillatingLinearMotion,
dictionary dictionary
); );
}; };
@ -46,7 +46,7 @@ namespace solidBodyMotionFunctions
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::solidBodyMotionFunctions::oscillatingMotion::oscillatingMotion Foam::solidBodyMotionFunctions::oscillatingLinearMotion::oscillatingLinearMotion
( (
const dictionary& SBMFCoeffs, const dictionary& SBMFCoeffs,
const Time& runTime const Time& runTime
@ -60,14 +60,14 @@ Foam::solidBodyMotionFunctions::oscillatingMotion::oscillatingMotion
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
Foam::solidBodyMotionFunctions::oscillatingMotion::~oscillatingMotion() Foam::solidBodyMotionFunctions::oscillatingLinearMotion::~oscillatingLinearMotion()
{} {}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam::septernion Foam::septernion
Foam::solidBodyMotionFunctions::oscillatingMotion::transformation() const Foam::solidBodyMotionFunctions::oscillatingLinearMotion::transformation() const
{ {
scalar t = time_.value(); scalar t = time_.value();
@ -76,14 +76,14 @@ Foam::solidBodyMotionFunctions::oscillatingMotion::transformation() const
quaternion R(0, 0, 0); quaternion R(0, 0, 0);
septernion TR(septernion(displacement)*R); septernion TR(septernion(displacement)*R);
Info<< "solidBodyMotionFunctions::oscillatingMotion::transformation(): " Info<< "solidBodyMotionFunctions::oscillatingLinearMotion::transformation(): "
<< "Time = " << t << " transformation: " << TR << endl; << "Time = " << t << " transformation: " << TR << endl;
return TR; return TR;
} }
bool Foam::solidBodyMotionFunctions::oscillatingMotion::read bool Foam::solidBodyMotionFunctions::oscillatingLinearMotion::read
( (
const dictionary& SBMFCoeffs const dictionary& SBMFCoeffs
) )

22
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingMotion/oscillatingMotion.H → src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
View File

@ -23,18 +23,18 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class Class
Foam::solidBodyMotionFunctions::oscillatingMotion Foam::solidBodyMotionFunctions::oscillatingLinearMotion
Description Description
SolidBodyMotionFvMesh 6DoF motion function. Oscillating displacement. SolidBodyMotionFvMesh 6DoF motion function. Oscillating displacement.
SourceFiles SourceFiles
oscillatingMotion.C oscillatingLinearMotion.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef oscillatingMotion_H #ifndef oscillatingLinearMotion_H
#define oscillatingMotion_H #define oscillatingLinearMotion_H
#include "solidBodyMotionFunction.H" #include "solidBodyMotionFunction.H"
#include "primitiveFields.H" #include "primitiveFields.H"
@ -48,10 +48,10 @@ namespace solidBodyMotionFunctions
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class oscillatingMotion Declaration Class oscillatingLinearMotion Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class oscillatingMotion class oscillatingLinearMotion
: :
public solidBodyMotionFunction public solidBodyMotionFunction
{ {
@ -67,22 +67,22 @@ class oscillatingMotion
// Private Member Functions // Private Member Functions
//- Disallow copy construct //- Disallow copy construct
oscillatingMotion(const oscillatingMotion&); oscillatingLinearMotion(const oscillatingLinearMotion&);
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const oscillatingMotion&); void operator=(const oscillatingLinearMotion&);
public: public:
//- Runtime type information //- Runtime type information
TypeName("oscillatingMotion"); TypeName("oscillatingLinearMotion");
// Constructors // Constructors
//- Construct from components //- Construct from components
oscillatingMotion oscillatingLinearMotion
( (
const dictionary& SBMFCoeffs, const dictionary& SBMFCoeffs,
const Time& runTime const Time& runTime
@ -91,7 +91,7 @@ public:
// Destructor // Destructor
virtual ~oscillatingMotion(); virtual ~oscillatingLinearMotion();
// Member Functions // Member Functions

16
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rockingMotion/rockingMotion.C → src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "rockingMotion.H" #include "oscillatingRotatingMotion.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathConstants.H" #include "mathConstants.H"
@ -36,11 +36,11 @@ namespace Foam
{ {
namespace solidBodyMotionFunctions namespace solidBodyMotionFunctions
{ {
defineTypeNameAndDebug(rockingMotion, 0); defineTypeNameAndDebug(oscillatingRotatingMotion, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
( (
solidBodyMotionFunction, solidBodyMotionFunction,
rockingMotion, oscillatingRotatingMotion,
dictionary dictionary
); );
}; };
@ -49,7 +49,7 @@ namespace solidBodyMotionFunctions
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::solidBodyMotionFunctions::rockingMotion::rockingMotion Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::oscillatingRotatingMotion
( (
const dictionary& SBMFCoeffs, const dictionary& SBMFCoeffs,
const Time& runTime const Time& runTime
@ -63,14 +63,14 @@ Foam::solidBodyMotionFunctions::rockingMotion::rockingMotion
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
Foam::solidBodyMotionFunctions::rockingMotion::~rockingMotion() Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::~oscillatingRotatingMotion()
{} {}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam::septernion Foam::septernion
Foam::solidBodyMotionFunctions::rockingMotion::transformation() const Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::transformation() const
{ {
scalar t = time_.value(); scalar t = time_.value();
@ -82,14 +82,14 @@ Foam::solidBodyMotionFunctions::rockingMotion::transformation() const
quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z()); quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z());
septernion TR(septernion(CofG_)*R*septernion(-CofG_)); septernion TR(septernion(CofG_)*R*septernion(-CofG_));
Info<< "solidBodyMotionFunctions::rockingMotion::transformation(): " Info<< "solidBodyMotionFunctions::oscillatingRotatingMotion::transformation(): "
<< "Time = " << t << " transformation: " << TR << endl; << "Time = " << t << " transformation: " << TR << endl;
return TR; return TR;
} }
bool Foam::solidBodyMotionFunctions::rockingMotion::read bool Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::read
( (
const dictionary& SBMFCoeffs const dictionary& SBMFCoeffs
) )

22
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rockingMotion/rockingMotion.H → src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
View File

@ -23,18 +23,18 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class Class
Foam::solidBodyMotionFunctions::rockingMotion Foam::solidBodyMotionFunctions::oscillatingRotatingMotion
Description Description
SolidBodyMotionFvMesh 6DoF motion function. Oscillating rotation. SolidBodyMotionFvMesh 6DoF motion function. Oscillating rotation.
SourceFiles SourceFiles
rockingMotion.C oscillatingRotatingMotion.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef rockingMotion_H #ifndef oscillatingRotatingMotion_H
#define rockingMotion_H #define oscillatingRotatingMotion_H
#include "solidBodyMotionFunction.H" #include "solidBodyMotionFunction.H"
#include "primitiveFields.H" #include "primitiveFields.H"
@ -48,10 +48,10 @@ namespace solidBodyMotionFunctions
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class rockingMotion Declaration Class oscillatingRotatingMotion Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class rockingMotion class oscillatingRotatingMotion
: :
public solidBodyMotionFunction public solidBodyMotionFunction
{ {
@ -70,22 +70,22 @@ class rockingMotion
// Private Member Functions // Private Member Functions
//- Disallow copy construct //- Disallow copy construct
rockingMotion(const rockingMotion&); oscillatingRotatingMotion(const oscillatingRotatingMotion&);
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const rockingMotion&); void operator=(const oscillatingRotatingMotion&);
public: public:
//- Runtime type information //- Runtime type information
TypeName("rockingMotion"); TypeName("oscillatingRotatingMotion");
// Constructors // Constructors
//- Construct from components //- Construct from components
rockingMotion oscillatingRotatingMotion
( (
const dictionary& SBMFCoeffs, const dictionary& SBMFCoeffs,
const Time& runTime const Time& runTime
@ -94,7 +94,7 @@ public:
// Destructor // Destructor
virtual ~rockingMotion(); virtual ~oscillatingRotatingMotion();
// Member Functions // Member Functions

16
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotationMotion/rotationMotion.C → src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "rotationMotion.H" #include "rotatingMotion.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathConstants.H" #include "mathConstants.H"
@ -36,11 +36,11 @@ namespace Foam
{ {
namespace solidBodyMotionFunctions namespace solidBodyMotionFunctions
{ {
defineTypeNameAndDebug(rotationMotion, 0); defineTypeNameAndDebug(rotatingMotion, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
( (
solidBodyMotionFunction, solidBodyMotionFunction,
rotationMotion, rotatingMotion,
dictionary dictionary
); );
}; };
@ -49,7 +49,7 @@ namespace solidBodyMotionFunctions
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::solidBodyMotionFunctions::rotationMotion::rotationMotion Foam::solidBodyMotionFunctions::rotatingMotion::rotatingMotion
( (
const dictionary& SBMFCoeffs, const dictionary& SBMFCoeffs,
const Time& runTime const Time& runTime
@ -63,14 +63,14 @@ Foam::solidBodyMotionFunctions::rotationMotion::rotationMotion
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
Foam::solidBodyMotionFunctions::rotationMotion::~rotationMotion() Foam::solidBodyMotionFunctions::rotatingMotion::~rotatingMotion()
{} {}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam::septernion Foam::septernion
Foam::solidBodyMotionFunctions::rotationMotion::transformation() const Foam::solidBodyMotionFunctions::rotatingMotion::transformation() const
{ {
scalar t = time_.value(); scalar t = time_.value();
@ -85,14 +85,14 @@ Foam::solidBodyMotionFunctions::rotationMotion::transformation() const
quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z()); quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z());
septernion TR(septernion(CofG_)*R*septernion(-CofG_)); septernion TR(septernion(CofG_)*R*septernion(-CofG_));
Info<< "solidBodyMotionFunctions::rotationMotion::transformation(): " Info<< "solidBodyMotionFunctions::rotatingMotion::transformation(): "
<< "Time = " << t << " transformation: " << TR << endl; << "Time = " << t << " transformation: " << TR << endl;
return TR; return TR;
} }
bool Foam::solidBodyMotionFunctions::rotationMotion::read bool Foam::solidBodyMotionFunctions::rotatingMotion::read
( (
const dictionary& SBMFCoeffs const dictionary& SBMFCoeffs
) )

22
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotationMotion/rotationMotion.H → src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
View File

@ -23,19 +23,19 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class Class
Foam::solidBodyMotionFunctions::rotationMotion Foam::solidBodyMotionFunctions::rotatingMotion
Description Description
SolidBodyMotionFvMesh 6DoF motion function. Constant SolidBodyMotionFvMesh 6DoF motion function. Constant
velocity rotation around CoG. velocity rotation around CoG.
SourceFiles SourceFiles
rotationMotion.C rotatingMotion.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef rotationMotion_H #ifndef rotatingMotion_H
#define rotationMotion_H #define rotatingMotion_H
#include "solidBodyMotionFunction.H" #include "solidBodyMotionFunction.H"
#include "primitiveFields.H" #include "primitiveFields.H"
@ -49,10 +49,10 @@ namespace solidBodyMotionFunctions
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class rotationMotion Declaration Class rotatingMotion Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class rotationMotion class rotatingMotion
: :
public solidBodyMotionFunction public solidBodyMotionFunction
{ {
@ -68,22 +68,22 @@ class rotationMotion
// Private Member Functions // Private Member Functions
//- Disallow copy construct //- Disallow copy construct
rotationMotion(const rotationMotion&); rotatingMotion(const rotatingMotion&);
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const rotationMotion&); void operator=(const rotatingMotion&);
public: public:
//- Runtime type information //- Runtime type information
TypeName("rotationMotion"); TypeName("rotatingMotion");
// Constructors // Constructors
//- Construct from components //- Construct from components
rotationMotion rotatingMotion
( (
const dictionary& SBMFCoeffs, const dictionary& SBMFCoeffs,
const Time& runTime const Time& runTime
@ -92,7 +92,7 @@ public:
// Destructor // Destructor
virtual ~rotationMotion(); virtual ~rotatingMotion();
// Member Functions // Member Functions