From 796555d1e7e35560e2474e3daa24f315894a427e Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 22 May 2009 13:22:05 +0100
Subject: [PATCH] added copy, and updated clone constructors
---
src/lagrangian/basic/Particle/Particle.H | 10 ++++++++++
.../Templates/KinematicParcel/KinematicParcel.H | 7 +++++--
.../ReactingMultiphaseParcel.H | 14 +++++++++-----
.../Templates/ReactingParcel/ReactingParcel.H | 7 +++++--
.../parcels/Templates/ThermoParcel/ThermoParcel.H | 7 +++++--
.../basicKinematicParcel/basicKinematicParcel.C | 9 +++++++++
.../basicKinematicParcel/basicKinematicParcel.H | 10 ++++++++--
.../basicReactingMultiphaseParcel.C | 9 +++++++++
.../basicReactingMultiphaseParcel.H | 10 ++++++++--
.../basicReactingParcel/basicReactingParcel.C | 9 +++++++++
.../basicReactingParcel/basicReactingParcel.H | 9 ++++++++-
.../derived/basicThermoParcel/basicThermoParcel.C | 9 +++++++++
.../derived/basicThermoParcel/basicThermoParcel.H | 9 ++++++++-
13 files changed, 102 insertions(+), 17 deletions(-)
diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H
index 75a0b041744..e7119c77b66 100644
--- a/src/lagrangian/basic/Particle/Particle.H
+++ b/src/lagrangian/basic/Particle/Particle.H
@@ -278,6 +278,16 @@ public:
bool readFields = true
);
+ //- Construct as a copy
+ Particle(const Particle& p);
+
+ //- Construct a clone
+ autoPtr<ParticleType> clone() const
+ {
+ return autoPtr<Particle>(new Particle(*this));
+ }
+
+
//- Factory class to read-construct particles used for
// parallel transfer
class iNew
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 82d7c2ccd9e..f5844669d7d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -278,10 +278,13 @@ public:
bool readFields = true
);
+ //- Construct as a copy
+ KinematicParcel(const KinematicParcel& p);
+
//- Construct and return a clone
- autoPtr<ParcelType> clone() const
+ autoPtr<KinematicParcel> clone() const
{
- return autoPtr<ParcelType>(new KinematicParcel<ParcelType>(*this));
+ return autoPtr<KinematicParcel>(new KinematicParcel(*this));
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index c3ce7e00739..ba35eadfe1f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -295,13 +295,17 @@ public:
bool readFields = true
);
+ //- Construct as a copy
+ ReactingMultiphaseParcel(const ReactingMultiphaseParcel& p);
+
//- Construct and return a clone
- autoPtr<ParcelType> clone() const
+ autoPtr<ReactingMultiphaseParcel> clone() const
{
- return autoPtr<ParcelType>
- (
- new ReactingMultiphaseParcel<ParcelType>(*this)
- );
+ return
+ autoPtr<ReactingMultiphaseParcel>
+ (
+ new ReactingMultiphaseParcel(*this)
+ );
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 59e22d7d068..f333bd0a8be 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -244,10 +244,13 @@ public:
bool readFields = true
);
+ //- Construct as a copy
+ ReactingParcel(const ReactingParcel& p);
+
//- Construct and return a clone
- autoPtr<ParcelType> clone() const
+ autoPtr<ReactingParcel> clone() const
{
- return autoPtr<ParcelType>(new ReactingParcel<ParcelType>(*this));
+ return autoPtr<ReactingParcel>(new ReactingParcel(*this));
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 1927ca3de69..800c0388682 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -257,10 +257,13 @@ public:
bool readFields = true
);
+ //- Construct as a copy
+ ThermoParcel(const ThermoParcel& p);
+
//- Construct and return a clone
- autoPtr<ParcelType> clone() const
+ autoPtr<ThermoParcel> clone() const
{
- return autoPtr<ParcelType>(new ThermoParcel<ParcelType>(*this));
+ return autoPtr<ThermoParcel>(new ThermoParcel(*this));
}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
index d2078878263..2f0bd818c60 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
@@ -75,6 +75,15 @@ Foam::basicKinematicParcel::basicKinematicParcel
{}
+Foam::basicKinematicParcel::basicKinematicParcel
+(
+ const basicKinematicParcel& p
+)
+:
+ KinematicParcel<basicKinematicParcel>(p)
+{}
+
+
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * //
Foam::basicKinematicParcel::~basicKinematicParcel()
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
index 0e5733870f2..c16a476c775 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
@@ -81,11 +81,17 @@ public:
bool readFields = true
);
+ //- Construct as a copy
+ basicKinematicParcel(const basicKinematicParcel& p);
+
//- Construct and return a clone
autoPtr<basicKinematicParcel> clone() const
{
- return autoPtr<basicKinematicParcel>
- (new basicKinematicParcel(*this));
+ return
+ autoPtr<basicKinematicParcel>
+ (
+ new basicKinematicParcel(*this)
+ );
}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
index d2007383190..abe05604007 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
@@ -88,6 +88,15 @@ Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
{}
+Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
+(
+ const basicReactingMultiphaseParcel& p
+)
+:
+ ReactingMultiphaseParcel<basicReactingMultiphaseParcel>(p)
+{}
+
+
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * //
Foam::basicReactingMultiphaseParcel::~basicReactingMultiphaseParcel()
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
index cc537e56380..47a000be7a1 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
@@ -85,11 +85,17 @@ public:
bool readFields = true
);
+ //- Construct as a copy
+ basicReactingMultiphaseParcel(const basicReactingMultiphaseParcel& p);
+
//- Construct and return a clone
autoPtr<basicReactingMultiphaseParcel> clone() const
{
- return autoPtr<basicReactingMultiphaseParcel>
- (new basicReactingMultiphaseParcel(*this));
+ return
+ autoPtr<basicReactingMultiphaseParcel>
+ (
+ new basicReactingMultiphaseParcel(*this)
+ );
}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
index 72ac1f4842f..bef5bbd0eec 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
@@ -77,6 +77,15 @@ Foam::basicReactingParcel::basicReactingParcel
{}
+Foam::basicReactingParcel::basicReactingParcel
+(
+ const basicReactingParcel& p
+)
+:
+ ReactingParcel<basicReactingParcel>(p)
+{}
+
+
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * //
Foam::basicReactingParcel::~basicReactingParcel()
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
index fae88a2da7b..bebb4961c0f 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
@@ -82,10 +82,17 @@ public:
bool readFields = true
);
+ //- Construct as a copy
+ basicReactingParcel(const basicReactingParcel& p);
+
//- Construct and return a clone
autoPtr<basicReactingParcel> clone() const
{
- return autoPtr<basicReactingParcel>(new basicReactingParcel(*this));
+ return
+ autoPtr<basicReactingParcel>
+ (
+ new basicReactingParcel(*this)
+ );
}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
index 095b217aca7..970d28169c7 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
@@ -75,6 +75,15 @@ Foam::basicThermoParcel::basicThermoParcel
{}
+Foam::basicThermoParcel::basicThermoParcel
+(
+ const basicThermoParcel& p
+)
+:
+ ThermoParcel<basicThermoParcel>(p)
+{}
+
+
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * //
Foam::basicThermoParcel::~basicThermoParcel()
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
index ec74d2add8a..93026560e0a 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
@@ -80,10 +80,17 @@ public:
bool readFields = true
);
+ //- Construct as a copy
+ basicThermoParcel(const basicThermoParcel& p);
+
//- Construct and return a clone
autoPtr<basicThermoParcel> clone() const
{
- return autoPtr<basicThermoParcel>(new basicThermoParcel(*this));
+ return
+ autoPtr<basicThermoParcel>
+ (
+ new basicThermoParcel(*this)
+ );
}
--
GitLab