Implementation of constraints, part 3

src/ODE/sixDOF/constraints/rotationalConstraints/constantAngularAcceleration/constantAngularAcceleration.C

@@ -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()

src/ODE/sixDOF/constraints/rotationalConstraints/constantAngularAcceleration/constantAngularAcceleration.H

@@ -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
 

src/ODE/sixDOF/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H

@@ -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
 

src/ODE/sixDOF/constraints/translationalConstraints/constantTranslationalAcceleration/constantTranslationalAcceleration.C

@@ -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()

src/ODE/sixDOF/constraints/translationalConstraints/constantTranslationalAcceleration/constantTranslationalAcceleration.H

@@ -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
 

src/ODE/sixDOF/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H

@@ -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
 

src/ODE/sixDOF/geometricSixDOF/geometricSixDOF.C

@@ -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_;
 }