From ea398214f1f99a911bbe7e9e2ad6169992f268df Mon Sep 17 00:00:00 2001 From: Vuko Vukcevic Date: Mon, 13 Mar 2017 16:19:02 +0100 Subject: [PATCH] Added access functions in constraints/restraints --- .../rotationalConstraint/rotationalConstraint.C | 12 ++++++++++++ .../rotationalConstraint/rotationalConstraint.H | 9 +++++++++ .../translationalConstraint.C | 12 ++++++++++++ .../translationalConstraint.H | 9 +++++++++ .../rotationalRestraint/rotationalRestraint.C | 12 ++++++++++++ .../rotationalRestraint/rotationalRestraint.H | 9 +++++++++ .../translationalRestraint/translationalRestraint.C | 12 ++++++++++++ .../translationalRestraint/translationalRestraint.H | 9 +++++++++ 8 files changed, 84 insertions(+) diff --git a/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.C b/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.C index b1f119202..7988f3619 100644 --- a/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.C +++ b/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.C @@ -56,6 +56,18 @@ Foam::rotationalConstraint::~rotationalConstraint() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +const Foam::word& Foam::rotationalConstraint::name() const +{ + return name_; +} + + +const Foam::sixDOFODE& Foam::rotationalConstraint::sixDOF() const +{ + return sixDOF_; +} + + Foam::autoPtr Foam::rotationalConstraint::New ( const word& name, diff --git a/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H b/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H index 874f0cee5..0ca52aa5b 100644 --- a/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H +++ b/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H @@ -164,6 +164,15 @@ public: // Member Functions + // Access functions + + //- Return name + const word& name() const; + + //- Return underlying sixDOFODE object + const sixDOFODE& sixDOF() const; + + // Constraint specific functions //- Return matrix contribution defined by constraint, f(t) diff --git a/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.C b/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.C index 70893b68d..a425355cd 100644 --- a/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.C +++ b/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.C @@ -56,6 +56,18 @@ Foam::translationalConstraint::~translationalConstraint() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +const Foam::word& Foam::translationalConstraint::name() const +{ + return name_; +} + + +const Foam::sixDOFODE& Foam::translationalConstraint::sixDOF() const +{ + return sixDOF_; +} + + Foam::autoPtr Foam::translationalConstraint::New ( const word& name, diff --git a/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H b/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H index 2c8730c80..ff157765f 100644 --- a/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H +++ b/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H @@ -164,6 +164,15 @@ public: // Member Functions + // Access functions + + //- Return name + const word& name() const; + + //- Return underlying sixDOFODE object + const sixDOFODE& sixDOF() const; + + // Constraint specific functions //- Return matrix contribution defined by constraint, f(t) diff --git a/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.C b/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.C index 1bbd3320a..e60385b88 100644 --- a/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.C +++ b/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.C @@ -56,6 +56,18 @@ Foam::rotationalRestraint::~rotationalRestraint() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +const Foam::word& Foam::rotationalRestraint::name() const +{ + return name_; +} + + +const Foam::sixDOFODE& Foam::rotationalRestraint::sixDOF() const +{ + return sixDOF_; +} + + Foam::autoPtr Foam::rotationalRestraint::New ( const word& name, diff --git a/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H b/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H index 929aa4a58..1f815209d 100644 --- a/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H +++ b/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H @@ -146,6 +146,15 @@ public: // Member Functions + // Access functions + + //- Return name + const word& name() const; + + //- Return underlying sixDOFODE object + const sixDOFODE& sixDOF() const; + + // Restraint specific functions //- Return restraining moment (in the local coordinate system) diff --git a/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.C b/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.C index ee5db151b..fc33feb57 100644 --- a/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.C +++ b/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.C @@ -56,6 +56,18 @@ Foam::translationalRestraint::~translationalRestraint() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +const Foam::word& Foam::translationalRestraint::name() const +{ + return name_; +} + + +const Foam::sixDOFODE& Foam::translationalRestraint::sixDOF() const +{ + return sixDOF_; +} + + Foam::autoPtr Foam::translationalRestraint::New ( const word& name, diff --git a/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H b/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H index 0d608c7b5..d4484b868 100644 --- a/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H +++ b/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H @@ -146,6 +146,15 @@ public: // Member Functions + // Access functions + + //- Return name + const word& name() const; + + //- Return underlying sixDOFODE object + const sixDOFODE& sixDOF() const; + + // Restraint specific functions //- Return restraining force (in the global coordinate system)