diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 7cab7776806b115b1ffcac360d79385a98c2b736..dc42e0f9db6267e8a75dff92eed00ce8706a44e8 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -308,7 +308,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
)
),
solution_(mesh_, particleProperties_.subDict("solution")),
- constProps_(particleProperties_, solution_.active()),
+ constProps_(particleProperties_),
subModelProperties_
(
particleProperties_.subOrEmptyDict("subModels", solution_.active())
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 0464da7e48e5dc15dea834b1c2314ab0db7edfe9..f99ac8bbbd03c534ff6e3126e6f5df284d109665 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -106,7 +106,7 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
CloudType(cloudName, rho, U, g, thermo, false),
reactingCloud(),
cloudCopyPtr_(NULL),
- constProps_(this->particleProperties(), this->solution().active()),
+ constProps_(this->particleProperties()),
compositionModel_(NULL),
phaseChangeModel_(NULL),
rhoTrans_(thermo.carrier().species().size())
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 31bc4c3222016cd1c13c21e9e52f8d4fe1973c6e..963cd985b25b02dffa0bf768ed5d0422be7a1a38 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -85,7 +85,7 @@ Foam::ReactingMultiphaseCloud<CloudType>::ReactingMultiphaseCloud
CloudType(cloudName, rho, U, g, thermo, false),
reactingMultiphaseCloud(),
cloudCopyPtr_(NULL),
- constProps_(this->particleProperties(), this->solution().active()),
+ constProps_(this->particleProperties()),
devolatilisationModel_(NULL),
surfaceReactionModel_(NULL),
dMassDevolatilisation_(0.0),
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index e97b6cfc2f48b3e2bd397689af9163b14e8cddd1..69666feddec17c4599cd8c726d3f7763688c2d68 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -153,7 +153,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
),
thermoCloud(),
cloudCopyPtr_(NULL),
- constProps_(this->particleProperties(), this->solution().active()),
+ constProps_(this->particleProperties()),
thermo_(thermo),
T_(thermo.thermo().T()),
p_(thermo.thermo().p()),
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 858ef573e74d3ed5faa791b5fde343965f4a3edd..929d24bdf2cc34dce0dc75a9c43884a1e323510b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -125,12 +125,8 @@ public:
//- Copy constructor
constantProperties(const constantProperties& cp);
- //- Constructor from dictionary
- constantProperties
- (
- const dictionary& parentDict,
- const bool readFields = true
- );
+ //- Construct from dictionary
+ constantProperties(const dictionary& parentDict);
//- Construct from components
constantProperties
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 470e63101e962b68217713019c692c6943264b83..dafcf471ebb722614b69f5870f09ebaf6d447266 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -62,8 +62,7 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
template<class ParcelType>
inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
(
- const dictionary& parentDict,
- const bool readFields
+ const dictionary& parentDict
)
:
dict_(parentDict.subOrEmptyDict("constantProperties")),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 695a92c5a9ecc43c1644b2cc454dd5ee58e08179..5623601e9110a4d266575b793baf62b002c9dc37 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -103,12 +103,8 @@ public:
//- Copy constructor
constantProperties(const constantProperties& cp);
- //- Constructor from dictionary
- constantProperties
- (
- const dictionary& parentDict,
- const bool readFields = true
- );
+ //- Construct from dictionary
+ constantProperties(const dictionary& parentDict);
//- Construct from components
constantProperties
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index e8eccae7112edc02837aa0c1f1c28a56ff032dcc..0c87df2267b95a7a6b1967bda22cc4f4799fa4a0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -54,11 +54,10 @@ template<class ParcelType>
inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
constantProperties
(
- const dictionary& parentDict,
- const bool readFields
+ const dictionary& parentDict
)
:
- ParcelType::constantProperties(parentDict, readFields),
+ ParcelType::constantProperties(parentDict),
TDevol_(this->dict_, "TDevol"),
LDevol_(this->dict_, "LDevol"),
hRetentionCoeff_(this->dict_, "hRetentionCoeff")
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index bb1fdd209e2983105da4b1d19f3845291dce93fa..27f3bcbcb9622b3fd8d6083170d9c9dc81ea17bb 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -92,12 +92,8 @@ public:
//- Copy constructor
constantProperties(const constantProperties& cp);
- //- Constructor from dictionary
- constantProperties
- (
- const dictionary& parentDict,
- const bool readFields = true
- );
+ //- Construct from dictionary
+ constantProperties(const dictionary& parentDict);
//- Construct from components
constantProperties
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 76fc0fcc3e56f5cce86b8ba4a2f94c8556316a42..24b4f1be54749b392d34a00a70a5c7a3cd3f5210 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -50,11 +50,10 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
template<class ParcelType>
inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
(
- const dictionary& parentDict,
- const bool readFields
+ const dictionary& parentDict
)
:
- ParcelType::constantProperties(parentDict, readFields),
+ ParcelType::constantProperties(parentDict),
pMin_(this->dict_, "pMin", 1000.0),
constantVolume_(this->dict_, "constantVolume")
{}
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 208c96117476fcffe099c5f963cb21840c746c06..695097355f005ff701bd8f5d2c06fdc9efc77a0d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -106,12 +106,8 @@ public:
//- Copy constructor
constantProperties(const constantProperties& cp);
- //- Constructor from dictionary
- constantProperties
- (
- const dictionary& parentDict,
- const bool readFields = true
- );
+ //- Construct from dictionary
+ constantProperties(const dictionary& parentDict);
//- Construct from components
constantProperties
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index fe055f0cd27f89bb51c078f8f8eac6ac12f92286..21007647586130b934940ed0dab7b06c78142eb5 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -57,11 +57,10 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
template<class ParcelType>
inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
(
- const dictionary& parentDict,
- const bool readFields
+ const dictionary& parentDict
)
:
- ParcelType::constantProperties(parentDict, readFields),
+ ParcelType::constantProperties(parentDict),
T0_(this->dict_, "T0"),
TMin_(this->dict_, "TMin", 200.0),
TMax_(this->dict_, "TMax", 5000.0),
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
index 9c6b19b90ce0aab0c954ae4dd55900869eab570a..8b411e2c47e421055d38b694c13660014f76636d 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
@@ -86,12 +86,8 @@ public:
//- Copy constructor
constantProperties(const constantProperties& cp);
- //- Constructor from dictionary
- constantProperties
- (
- const dictionary& parentDict,
- const bool readFields = true
- );
+ //- Construct from dictionary
+ constantProperties(const dictionary& parentDict);
//- Construct from components
constantProperties
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H
index efaf91f68efd228ffc2f28bc726828e8d43e25a3..1e08f093d457b18838076ed1e9e337ccfaa314b0 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H
@@ -49,11 +49,10 @@ inline Foam::SprayParcel<ParcelType>::constantProperties::constantProperties
template<class ParcelType>
inline Foam::SprayParcel<ParcelType>::constantProperties::constantProperties
(
- const dictionary& parentDict,
- const bool readFields
+ const dictionary& parentDict
)
:
- ParcelType::constantProperties(parentDict, readFields),
+ ParcelType::constantProperties(parentDict),
sigma0_(this->dict_, "sigma0"),
mu0_(this->dict_, "mu0")
{}