From 3bc8dbbb28d2eaf6ea872fd8908afddd3e16dc46 Mon Sep 17 00:00:00 2001 From: Vuko Vukcevic Date: Mon, 27 Feb 2017 08:25:08 +0100 Subject: [PATCH] Reorganized sixDOFbodies in terms of sixDOFODE --- .../solvers/basic/sixDOFSolver/sixDOFSolver.C | 4 +-- src/ODE/Make/files | 3 +- .../sixDOFBodies.C} | 21 +++++++------ .../sixDOFBodies.H} | 31 +++++++++---------- 4 files changed, 30 insertions(+), 29 deletions(-) rename src/ODE/sixDOF/{sixDOFbodies/sixDOFbodies.C => sixDOFBodies/sixDOFBodies.C} (87%) rename src/ODE/sixDOF/{sixDOFbodies/sixDOFbodies.H => sixDOFBodies/sixDOFBodies.H} (82%) diff --git a/applications/solvers/basic/sixDOFSolver/sixDOFSolver.C b/applications/solvers/basic/sixDOFSolver/sixDOFSolver.C index 556550ffb..e543f3c2a 100644 --- a/applications/solvers/basic/sixDOFSolver/sixDOFSolver.C +++ b/applications/solvers/basic/sixDOFSolver/sixDOFSolver.C @@ -36,7 +36,7 @@ Description #include "objectRegistry.H" #include "foamTime.H" #include "ODESolver.H" -#include "sixDOFbodies.H" +#include "sixDOFBodies.H" #include "OFstream.H" using namespace Foam; @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) # include "setRootCase.H" # include "createTime.H" - sixDOFbodies structure(runTime); + sixDOFBodies structure(runTime); OFstream of(runTime.path()/"motion.dat"); Info<< "\nStarting time loop\n" << endl; diff --git a/src/ODE/Make/files b/src/ODE/Make/files index d43be82df..815b29ed3 100644 --- a/src/ODE/Make/files +++ b/src/ODE/Make/files @@ -12,10 +12,11 @@ $(ODESolvers)/SIBS/polyExtrapolate.C sixDOF = sixDOF $(sixDOF)/finiteRotation/finiteRotation.C $(sixDOF)/sixDOFqODE/sixDOFqODE.C -$(sixDOF)/sixDOFbodies/sixDOFbodies.C $(sixDOF)/sixDOFODE/sixDOFODE.C $(sixDOF)/sixDOFODE/newSixDOFODE.C $(sixDOF)/quaternionSixDOF/quaternionSixDOF.C +$(sixDOF)/sixDOFBodies/sixDOFBodies.C + LIB = $(FOAM_LIBBIN)/libODE diff --git a/src/ODE/sixDOF/sixDOFbodies/sixDOFbodies.C b/src/ODE/sixDOF/sixDOFBodies/sixDOFBodies.C similarity index 87% rename from src/ODE/sixDOF/sixDOFbodies/sixDOFbodies.C rename to src/ODE/sixDOF/sixDOFBodies/sixDOFBodies.C index 83d99ca5b..cd72941e3 100644 --- a/src/ODE/sixDOF/sixDOFbodies/sixDOFbodies.C +++ b/src/ODE/sixDOF/sixDOFBodies/sixDOFBodies.C @@ -22,7 +22,7 @@ License along with foam-extend. If not, see . Class - sixDOFbodies + sixDOFBodies Description 6-DOF solver for multiple bodies @@ -33,11 +33,11 @@ Author \*---------------------------------------------------------------------------*/ #include "objectRegistry.H" -#include "sixDOFbodies.H" +#include "sixDOFBodies.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::sixDOFbodies::setBodies() +void Foam::sixDOFBodies::setBodies() { // Find if duplicate name existes forAll (names_, bodyI) @@ -51,8 +51,9 @@ void Foam::sixDOFbodies::setBodies() { if (names_[bodyI] == names_[otherBody]) { - FatalErrorIn("sixDOFbodies::setBodies()") - << "Duplicate names of bodies: this is not allowed" + FatalErrorIn("sixDOFBodies::setBodies()") + << "Found duplicate name: " << names_[bodyI] + << " for bodies. This is not allowed." << exit(FatalError); } } @@ -66,7 +67,7 @@ void Foam::sixDOFbodies::setBodies() odes_.set ( bodyI, - new sixDOFqODE + sixDOFODE::New ( IOobject ( @@ -94,7 +95,7 @@ void Foam::sixDOFbodies::setBodies() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::sixDOFbodies::sixDOFbodies +Foam::sixDOFBodies::sixDOFBodies ( const Time& runTime ) @@ -121,7 +122,7 @@ Foam::sixDOFbodies::sixDOFbodies // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::sixDOFbodies::solve() +void Foam::sixDOFBodies::solve() { const scalar tol = readScalar(lookup("eps")); @@ -141,13 +142,13 @@ void Foam::sixDOFbodies::solve() } -const Foam::wordList& Foam::sixDOFbodies::names() const +const Foam::wordList& Foam::sixDOFBodies::names() const { return names_; } -const Foam::PtrList& Foam::sixDOFbodies::operator()() const +const Foam::PtrList& Foam::sixDOFBodies::operator()() const { return odes_; } diff --git a/src/ODE/sixDOF/sixDOFbodies/sixDOFbodies.H b/src/ODE/sixDOF/sixDOFBodies/sixDOFBodies.H similarity index 82% rename from src/ODE/sixDOF/sixDOFbodies/sixDOFbodies.H rename to src/ODE/sixDOF/sixDOFBodies/sixDOFBodies.H index 3a5115983..76c838118 100644 --- a/src/ODE/sixDOF/sixDOFbodies/sixDOFbodies.H +++ b/src/ODE/sixDOF/sixDOFBodies/sixDOFBodies.H @@ -22,7 +22,7 @@ License along with foam-extend. If not, see . Class - sixDOFbodies + sixDOFBodies Description 6-DOF solver for multiple bodies @@ -31,18 +31,17 @@ Author Dubravko Matijasevic, FSB Zagreb. All rights reserved. SourceFiles - sixDOFbodies.C + sixDOFBodies.C \*---------------------------------------------------------------------------*/ -#ifndef sixDOFbodies_H -#define sixDOFbodies_H +#ifndef sixDOFBodies_H +#define sixDOFBodies_H #include "foamTime.H" #include "IOdictionary.H" -#include "sixDOFqODE.H" +#include "sixDOFODE.H" #include "ODESolver.H" -#include "finiteRotation.H" #include "primitiveFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,10 +50,10 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class sixDOFbodies Declaration + Class sixDOFBodies Declaration \*---------------------------------------------------------------------------*/ -class sixDOFbodies +class sixDOFBodies : public IOdictionary { @@ -63,10 +62,10 @@ class sixDOFbodies //- Reference to time const Time& runTime_; - // Pointer list of Foam::sixDOFqODE objects - PtrList odes_; + // Pointer list of Foam::sixDOFODE objects + PtrList odes_; - // Pointer list of Foam::sixDOFqODE solvers + // Pointer list of Foam::sixDOFODE solvers PtrList solvers_; // Name list of solved bodies @@ -76,10 +75,10 @@ class sixDOFbodies // Private Member Functions //- Disallow default bitwise copy construct - sixDOFbodies(const sixDOFbodies&); + sixDOFBodies(const sixDOFBodies&); //- Disallow default bitwise assignment - void operator=(const sixDOFbodies&); + void operator=(const sixDOFBodies&); //- Set bodies void setBodies(); @@ -90,12 +89,12 @@ public: // Constructors //- Construct from Time - sixDOFbodies(const Time& runTime); + sixDOFBodies(const Time& runTime); // Destructor - virtual ~sixDOFbodies() + virtual ~sixDOFBodies() {} @@ -105,7 +104,7 @@ public: const wordList& names() const; //- Return list of bodies - const PtrList& operator()() const; + const PtrList& operator()() const; //- Solve ODEs and update position void solve();