exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implementation of constraints, part 3

Browse source
This commit is contained in:
Vuko Vukcevic 2017-03-07 10:52:00 +01:00 committed by Hrvoje Jasak
parent 488ccffca9
commit 041fddd197
7 changed files with 33 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ODE/sixDOF/constraints/rotationalConstraints/constantAngularAcceleration/constantAngularAcceleration.C
View file

@ -55,6 +55,16 @@ Foam::constantAngularAcceleration::constantAngularAcceleration
{}
Foam::autoPtr<Foam::rotationalConstraint>
Foam::constantAngularAcceleration::clone() const
{
return autoPtr<rotationalConstraint>
(
new constantAngularAcceleration(*this)
);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::constantAngularAcceleration::~constantAngularAcceleration()

12
src/ODE/sixDOF/constraints/rotationalConstraints/constantAngularAcceleration/constantAngularAcceleration.H
View file

@ -69,15 +69,6 @@ class constantAngularAcceleration
const Switch inGlobal_;
// Private Member Functions
//- Disallow default bitwise copy construct
constantAngularAcceleration(const constantAngularAcceleration&);
//- Disallow default bitwise assignment
void operator=(const constantAngularAcceleration&);
public:
//- Runtime type information
@ -94,6 +85,9 @@ public:
const dictionary& dict
);
//- Construct and return a clone
virtual autoPtr<rotationalConstraint> clone() const;
// Destructor

12
src/ODE/sixDOF/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H
View file

@ -78,15 +78,6 @@ class rotationalConstraint
const sixDOFODE& sixDOFODE_;
// Private Member Functions
//- Disallow default bitwise copy construct
rotationalConstraint(const rotationalConstraint&);
//- Disallow default bitwise assignment
void operator=(const rotationalConstraint&);
public:
//- Runtime type information
@ -141,6 +132,9 @@ public:
const dictionary& dict
);
//- Construct and return a clone
virtual autoPtr<rotationalConstraint> clone() const = 0;
// Selectors

10
src/ODE/sixDOF/constraints/translationalConstraints/constantTranslationalAcceleration/constantTranslationalAcceleration.C
View file

@ -54,6 +54,16 @@ Foam::constantTranslationalAcceleration::constantTranslationalAcceleration
{}
Foam::autoPtr<Foam::translationalConstraint>
Foam::constantTranslationalAcceleration::clone() const
{
return autoPtr<translationalConstraint>
(
new constantTranslationalAcceleration(*this)
);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::constantTranslationalAcceleration::~constantTranslationalAcceleration()

15
src/ODE/sixDOF/constraints/translationalConstraints/constantTranslationalAcceleration/constantTranslationalAcceleration.H
View file

@ -65,18 +65,6 @@ class constantTranslationalAcceleration
const scalar a_;
// Private Member Functions
//- Disallow default bitwise copy construct
constantTranslationalAcceleration
(
const constantTranslationalAcceleration&
);
//- Disallow default bitwise assignment
void operator=(const constantTranslationalAcceleration&);
public:
//- Runtime type information
@ -93,6 +81,9 @@ public:
const dictionary& dict
);
//- Construct and return a clone
virtual autoPtr<translationalConstraint> clone() const;
// Destructor

12
src/ODE/sixDOF/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H
View file

@ -78,15 +78,6 @@ class translationalConstraint
const sixDOFODE& sixDOFODE_;
// Private Member Functions
//- Disallow default bitwise copy construct
translationalConstraint(const translationalConstraint&);
//- Disallow default bitwise assignment
void operator=(const translationalConstraint&);
public:
//- Runtime type information
@ -141,6 +132,9 @@ public:
const dictionary& dict
);
//- Construct and return a clone
virtual autoPtr<translationalConstraint> clone() const = 0;
// Selectors

1
src/ODE/sixDOF/geometricSixDOF/geometricSixDOF.C
View file

@ -312,6 +312,7 @@ void Foam::geometricSixDOF::setState(const sixDOFODE& sd)
// HJ, 23/Mar/2015
coeffs_ = gsd.coeffs_;
// Copy constraints
translationalConstraints_ = gsd.translationalConstraints_;
rotationalConstraints_ = gsd.rotationalConstraints_;
}