diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H index 75a0b041744af33b9de9b805a8c46cabb4031e29..e7119c77b66573d5f7869931e462879bc6ceb58e 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 82d7c2ccd9e8293b10102214c419b686f9bb3266..f5844669d7d5db567cae094529c1b716177eb244 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 c3ce7e0073930614e434156f69d73fb1b3291339..ba35eadfe1f898c345ecf6e31cb43311eee13a65 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 59e22d7d06867b1152ec2679aa056c0e0700bff4..f333bd0a8be0472eefae39db18b1e3c5cb8b5621 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 1927ca3de692ab4b6fe01857e10b8211921d094d..800c03886825e45a2ce3e4a94ba3c7ae6c20e117 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 d207887826320ef12c6d724f9d52b150be3451dd..2f0bd818c6084f477b31b6d5f45445f7770a2703 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 0e5733870f2afc8ec47a9174c83c285ea69e5beb..c16a476c775f8cc984ca50729fe0e013b1cdffca 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 d200738319074ca40bbab59fb124b1b909bab94f..abe056040070f7b71302151e072375745d45e85c 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 cc537e56380eb666dbefb6db4bca83efcd293d33..47a000be7a1cf05589977f19d597f0c2bb7071f3 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 72ac1f4842f72de5353f4b7d7f7263a55f9e4235..bef5bbd0eec03b3534385b9509de88d7f51e21c2 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 fae88a2da7bd8a26295b904ba8c5830c2082036f..bebb4961c0feb7393bafbfe1c62a484e1277b6f6 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 095b217aca799ecb700f0f6e2538e0d9c7a52976..970d28169c7a11252dfffa08856ee8c0de230cf8 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 ec74d2add8ae675110efcafd9a84a8f8acff7044..93026560e0ae85978a2536fa7b1f95a30df154fe 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) + ); }