ENH: Extended parcel constantProperties constructors

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C

@@ -626,7 +626,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
         )
     ),
     solution_(mesh),
-    constProps_(dictionary::null),
+    constProps_(),
     subModelProperties_(dictionary::null),
     rndGen_(0, 0),
     cellOccupancyPtr_(NULL),

src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C

@@ -191,8 +191,9 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
     ThermoCloud<ParcelType>(mesh, name, c),
     reactingCloud(),
     cloudCopyPtr_(NULL),
-    constProps_(c.constProps_),
+    constProps_(),
-    compositionModel_(NULL),
+    compositionModel_(c.compositionModel_->clone()),
+//    compositionModel_(NULL),
     phaseChangeModel_(NULL),
     rhoTrans_(0),
     dMassPhaseChange_(0.0)

src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C

@@ -123,7 +123,7 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
     ReactingCloud<ParcelType>(mesh, name, c),
     reactingMultiphaseCloud(),
     cloudCopyPtr_(NULL),
-    constProps_(c.constProps_),
+    constProps_(),
     devolatilisationModel_(NULL),
     surfaceReactionModel_(NULL),
     dMassDevolatilisation_(0.0),

src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C

@@ -197,7 +197,7 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
     KinematicCloud<ParcelType>(mesh, name, c),
     thermoCloud(),
     cloudCopyPtr_(NULL),
-    constProps_(c.particleProperties_),
+    constProps_(),
     thermo_(c.thermo()),
     T_(c.T()),
     p_(c.p()),

src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H

@@ -118,9 +118,18 @@ public:
 
     public:
 
-        //- Constructor
+        // Constructors
+
+            //- Null constructor
+            constantProperties();
+
+            //- Copy constructor
+            constantProperties(const constantProperties& cp);
+
+            //- Constructor from dictionary
             constantProperties(const dictionary& parentDict);
 
+
         // Member functions
 
             //- Return const access to the constant properties dictionary

src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H

@@ -29,6 +29,36 @@ using namespace Foam::constant::mathematical;
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class ParcelType>
+inline
+Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties()
+:
+    dict_(dictionary::null),
+    parcelTypeId_(-1),
+    rhoMin_(0.0),
+    rho0_(0.0),
+    minParticleMass_(0.0),
+    youngsModulus_(0.0),
+    poissonsRatio_(0.0)
+{}
+
+
+template<class ParcelType>
+inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
+(
+    const constantProperties& cp
+)
+:
+    dict_(cp.dict_),
+    parcelTypeId_(cp.parcelTypeId_),
+    rhoMin_(cp.rhoMin_),
+    rho0_(cp.rho0_),
+    minParticleMass_(cp.minParticleMass_),
+    youngsModulus_(cp.youngsModulus_),
+    poissonsRatio_(cp.poissonsRatio_)
+{}
+
+
 template<class ParcelType>
 inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
 (

src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H

@@ -91,9 +91,18 @@ public:
 
     public:
 
-        //- Constructor
+        // Constructors
+
+            //- Null constructor
+            constantProperties();
+
+            //- Copy constructor
+            constantProperties(const constantProperties& cp);
+
+            //- Constructor from dictionary
             constantProperties(const dictionary& parentDict);
 
+
         // Access
 
             //- Return const access to the latent heat of devolatilisation

src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H

@@ -25,6 +25,31 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class ParcelType>
+inline
+Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
+constantProperties()
+:
+    ReactingParcel<ParcelType>::constantProperties(),
+    LDevol_(0.0),
+    hRetentionCoeff_(0.0)
+{}
+
+
+template<class ParcelType>
+inline
+Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
+constantProperties
+(
+    const constantProperties& cp
+)
+:
+    ReactingParcel<ParcelType>::constantProperties(cp),
+    LDevol_(cp.LDevol_),
+    hRetentionCoeff_(cp.hRetentionCoeff_)
+{}
+
+
 template<class ParcelType>
 inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
 constantProperties

src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H

@@ -91,9 +91,18 @@ public:
 
     public:
 
-        //- Constructor
+        // Constructors
+
+            //- Null constructor
+            constantProperties();
+
+            //- Copy constructor
+            constantProperties(const constantProperties& cp);
+
+            //- Constructor from dictionary
             constantProperties(const dictionary& parentDict);
 
+
         // Access
 
             //- Return const access to the minimum pressure

src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H

@@ -25,6 +25,32 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class ParcelType>
+inline
+Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties()
+:
+    ThermoParcel<ParcelType>::constantProperties(),
+    pMin_(0.0),
+    constantVolume_(false),
+    Tvap_(0.0),
+    Tbp_(0.0)
+{}
+
+
+template<class ParcelType>
+inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
+(
+    const constantProperties& cp
+)
+:
+    ThermoParcel<ParcelType>::constantProperties(cp),
+    pMin_(cp.pMin_),
+    constantVolume_(cp.constantVolume_),
+    Tvap_(cp.Tvap_),
+    Tbp_(cp.Tbp_)
+{}
+
+
 template<class ParcelType>
 inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
 (

src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H

@@ -98,8 +98,17 @@ public:
     public:
 
         // Constructors
+
+            //- Null constructor
+            constantProperties();
+
+            //- Copy constructor
+            constantProperties(const constantProperties& cp);
+
+            //- Constructor from dictionary
             constantProperties(const dictionary& parentDict);
 
+
         // Member functions
 
             // Access

src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H

@@ -25,6 +25,35 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class ParcelType>
+inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties()
+:
+    KinematicParcel<ParcelType>::constantProperties(),
+    T0_(0.0),
+    TMin_(0.0),
+    Cp0_(0.0),
+    epsilon0_(0.0),
+    f0_(0.0),
+    Pr_(0.0)
+{}
+
+
+template<class ParcelType>
+inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
+(
+    const constantProperties& cp
+)
+:
+    KinematicParcel<ParcelType>::constantProperties(cp),
+    T0_(cp.T0_),
+    TMin_(cp.TMin_),
+    Cp0_(cp.Cp0_),
+    epsilon0_(cp.epsilon0_),
+    f0_(cp.f0_),
+    Pr_(cp.Pr_)
+{}
+
+
 template<class ParcelType>
 inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
 (