diff --git a/src/lagrangian/coalCombustion/coalCloud/coalCloud.C b/src/lagrangian/coalCombustion/coalCloud/coalCloud.C
index a8d1dd867b4a881f6f0517583ff3034c383cde09..e41b822e38ccb0216cfcf8020b7a930dd8c5173f 100644
--- a/src/lagrangian/coalCombustion/coalCloud/coalCloud.C
+++ b/src/lagrangian/coalCombustion/coalCloud/coalCloud.C
@@ -38,7 +38,7 @@ namespace Foam
Foam::coalCloud::coalCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
@@ -48,7 +48,7 @@ Foam::coalCloud::coalCloud
:
ReactingMultiphaseCloud<coalParcel>
(
- cloudType,
+ cloudName,
rho,
U,
g,
diff --git a/src/lagrangian/coalCombustion/coalCloud/coalCloud.H b/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
index 72949ce14447e6280fd7e8c1597d97d989a33dd2..4b1d3e852d7b7cf46f9b669cd47f8e729c51f1f0 100644
--- a/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
+++ b/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
@@ -71,7 +71,7 @@ public:
//- Construct given carrier gas fields
coalCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
index 53177e9afebcc5a263917230543768ee48c5ebe1..30d7671fdbcf8e4b42295f67334c5fa178f534b9 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
@@ -527,20 +527,20 @@ void Foam::DsmcCloud<ParcelType>::addNewParcel
template<class ParcelType>
Foam::DsmcCloud<ParcelType>::DsmcCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& T,
const volVectorField& U
)
:
- Cloud<ParcelType>(T.mesh(), cloudType, false),
+ Cloud<ParcelType>(T.mesh(), cloudName, false),
DsmcBaseCloud(),
- cloudType_(cloudType),
+ cloudName_(cloudName),
mesh_(T.mesh()),
particleProperties_
(
IOobject
(
- cloudType + "Properties",
+ cloudName + "Properties",
mesh_.time().constant(),
mesh_,
IOobject::MUST_READ,
@@ -639,19 +639,19 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
template<class ParcelType>
Foam::DsmcCloud<ParcelType>::DsmcCloud
(
- const word& cloudType,
+ const word& cloudName,
const fvMesh& mesh
)
:
- Cloud<ParcelType>(mesh, cloudType, false),
+ Cloud<ParcelType>(mesh, cloudName, false),
DsmcBaseCloud(),
- cloudType_(cloudType),
+ cloudName_(cloudName),
mesh_(mesh),
particleProperties_
(
IOobject
(
- cloudType + "Properties",
+ cloudName + "Properties",
mesh_.time().constant(),
mesh_,
IOobject::MUST_READ,
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
index 20bed1ee7b14429c66fcc90b2dcb52023ff73241..46634e6dd903ece27ed83fec3975bc0156dfe7e1 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
@@ -76,7 +76,7 @@ class DsmcCloud
//- Cloud type - used to set the name of the parcel properties
// dictionary by appending "Properties"
- const word cloudType_;
+ const word cloudName_;
//- References to the mesh and time databases
const fvMesh& mesh_;
@@ -181,7 +181,7 @@ public:
//- Construct given name and mesh, will read Parcels from file
DsmcCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& T,
const volVectorField& U
);
@@ -189,7 +189,7 @@ public:
//- Construct given name and mesh. Used to initialise.
DsmcCloud
(
- const word& cloudType,
+ const word& cloudName,
const fvMesh& mesh
);
@@ -205,7 +205,7 @@ public:
// References to the mesh and databases
//- Return the cloud type
- inline const word& cloudType() const;
+ inline const word& cloudName() const;
//- Return refernce to the mesh
inline const fvMesh& mesh() const;
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
index d39de4954faa1a062ab15da0d878e736d542b42e..abc4b1d4c69a89cc828d2134652433a45802c7fe 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
@@ -27,9 +27,9 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ParcelType>
-inline const Foam::word& Foam::DsmcCloud<ParcelType>::cloudType() const
+inline const Foam::word& Foam::DsmcCloud<ParcelType>::cloudName() const
{
- return cloudType_;
+ return cloudName_;
}
diff --git a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.C b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.C
index 000ffcd53efb82dc4454009b3a28dc9c715cf124..d501dbf3d5d87d7a79b7d56512ddad465a838ca5 100644
--- a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.C
+++ b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.C
@@ -38,12 +38,12 @@ namespace Foam
Foam::dsmcCloud::dsmcCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& T,
const volVectorField& U
)
:
- DsmcCloud<dsmcParcel>(cloudType, T, U)
+ DsmcCloud<dsmcParcel>(cloudName, T, U)
{
dsmcParcel::readFields(*this);
}
@@ -51,11 +51,11 @@ Foam::dsmcCloud::dsmcCloud
Foam::dsmcCloud::dsmcCloud
(
- const word& cloudType,
+ const word& cloudName,
const fvMesh& mesh
)
:
- DsmcCloud<dsmcParcel>(cloudType, mesh)
+ DsmcCloud<dsmcParcel>(cloudName, mesh)
{}
diff --git a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
index 2f88bbaad563dbb99fef716f22256416ae98bc15..027ad2afec41d2a41f7ef11cc25667dbf6cccc25 100644
--- a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
+++ b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
@@ -72,7 +72,7 @@ public:
//- Construct from components
dsmcCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& T,
const volVectorField& U
);
@@ -80,7 +80,7 @@ public:
//- Construct from name and mesh, used to initialise.
dsmcCloud
(
- const word& cloudType,
+ const word& cloudName,
const fvMesh& mesh
);
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index e4f7325be9f406ef3d38a8861a309407b0ee1b19..0cd229d035019fd6b9d99e8edf472b01a2bcf743 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -72,22 +72,22 @@ void Foam::KinematicCloud<ParcelType>::addNewParcel
template<class ParcelType>
Foam::KinematicCloud<ParcelType>::KinematicCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const volScalarField& mu,
const dimensionedVector& g
)
:
- Cloud<ParcelType>(rho.mesh(), cloudType, false),
+ Cloud<ParcelType>(rho.mesh(), cloudName, false),
kinematicCloud(),
- cloudType_(cloudType),
+ cloudName_(cloudName),
mesh_(rho.mesh()),
particleProperties_
(
IOobject
(
- cloudType + "Properties",
+ cloudName + "Properties",
rho.mesh().time().constant(),
rho.mesh(),
IOobject::MUST_READ,
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 94d55a5c61a3712d94800e8ebd68c913a61fc674..ba83febe3c9b187921ec96c4c969cd746c83cd64 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -91,7 +91,7 @@ class KinematicCloud
//- Cloud type - used to set the name of the parcel properties
// dictionary by appending "Properties"
- const word cloudType_;
+ const word cloudName_;
//- References to the mesh and time databases
const fvMesh& mesh_;
@@ -193,7 +193,7 @@ public:
//- Construct given carrier gas fields
KinematicCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const volScalarField& mu,
@@ -216,7 +216,7 @@ public:
// References to the mesh and databases
//- Return the cloud type
- inline const word& cloudType() const;
+ inline const word& cloudName() const;
//- Return the parcel type id
inline label parcelTypeId() const;
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 4746efd73554663fed0a87fa3233f1f229702b26..b477901d7279bcf25c851edf919cf2fb462c21da 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -29,9 +29,9 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ParcelType>
-inline const Foam::word& Foam::KinematicCloud<ParcelType>::cloudType() const
+inline const Foam::word& Foam::KinematicCloud<ParcelType>::cloudName() const
{
- return cloudType_;
+ return cloudName_;
}
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index d9a0cb4eacfffbbe11a5b24276d3d7ea4efc9466..2c8c8cc1ee58946b4fd9b7d6f97ddea87c0868b1 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -67,7 +67,7 @@ void Foam::ReactingCloud<ParcelType>::addNewParcel
template<class ParcelType>
Foam::ReactingCloud<ParcelType>::ReactingCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
@@ -75,7 +75,7 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
PtrList<specieReactingProperties>& carrierSpecies
)
:
- ThermoCloud<ParcelType>(cloudType, rho, U, g, thermo),
+ ThermoCloud<ParcelType>(cloudName, rho, U, g, thermo),
reactingCloud(),
constProps_(this->particleProperties()),
carrierThermo_(thermo),
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 848da636042222f21ebf6cb0dfa8cf5787048539..75badafeab96bc9334117b82a0b72e1d151d1eaf 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -122,7 +122,7 @@ public:
//- Construct given carrier gas fields
ReactingCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 126054dd69d4281e5eb95c0564176fe94a7ab3da..82c8e5daa87321a6f7757dc64e95e5bd06f8c04a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -74,7 +74,7 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::addNewParcel
template<class ParcelType>
Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
@@ -82,7 +82,7 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
PtrList<specieReactingProperties>& carrierSpecies
)
:
- ReactingCloud<ParcelType>(cloudType, rho, U, g, thermo, carrierSpecies),
+ ReactingCloud<ParcelType>(cloudName, rho, U, g, thermo, carrierSpecies),
reactingMultiphaseCloud(),
constProps_(this->particleProperties()),
devolatilisationModel_
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index d16577c03ae6612723e84bac0d1036c1d3296b38..bfd9b4816a99c7d864b75ea80423850ddf1eb3ca 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -116,7 +116,7 @@ public:
//- Construct given carrier gas fields
ReactingMultiphaseCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index abf956a859467856e5ee6f29839f68787ab010bc..c7d43318e2817f0773e74b20c4fee542971f25b5 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -67,7 +67,7 @@ void Foam::ThermoCloud<ParcelType>::addNewParcel
template<class ParcelType>
Foam::ThermoCloud<ParcelType>::ThermoCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
@@ -76,7 +76,7 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
:
KinematicCloud<ParcelType>
(
- cloudType,
+ cloudName,
rho,
U,
thermo.mu(),
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 2e3aea4f23e808404d9749658780a23f5775d77c..a5cba35617a00893c33c3007e4bb52ef142405fd 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -125,7 +125,7 @@ public:
//- Construct given carrier gas fields
ThermoCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C
index 4e52274f8e029298574e7da9b1606a821743e754..4e58cfa767e054ec5a2562fb5185cd9806793ca1 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C
@@ -38,14 +38,14 @@ namespace Foam
Foam::basicKinematicCloud::basicKinematicCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const volScalarField& mu,
const dimensionedVector& g
)
:
- KinematicCloud<basicKinematicParcel>(cloudType, rho, U, mu, g)
+ KinematicCloud<basicKinematicParcel>(cloudName, rho, U, mu, g)
{
basicKinematicParcel::readFields(*this);
}
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
index 8a32780f351b4eeba5d86ef06dbfcf98ec9bc5f0..91a8ae2e5bd3134782f46fa7aa41101d48806bc5 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
@@ -72,7 +72,7 @@ public:
//- Construct from components
basicKinematicCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const volScalarField& mu,
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C
index 405dc4a65859aeefe410b8d564330d4d69183f7c..27c67a36ccd5826f674c38a7184643678b2fafbc 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C
@@ -38,7 +38,7 @@ namespace Foam
Foam::basicReactingCloud::basicReactingCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
@@ -48,7 +48,7 @@ Foam::basicReactingCloud::basicReactingCloud
:
ReactingCloud<basicReactingParcel>
(
- cloudType,
+ cloudName,
rho,
U,
g,
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
index 7a56097614a5f90c62c87ce5eddb311f2466e25d..c6c6a625c0a860069e9f0286f5961481dc73260b 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
@@ -72,7 +72,7 @@ public:
//- Construct given carrier gas fields
basicReactingCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
index d174e0ea0ac3511d26cab78da24a3a578bc34746..9bd8b9c772d7098a6660dd04a41535cab16f66be 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
@@ -38,7 +38,7 @@ namespace Foam
Foam::basicReactingMultiphaseCloud::basicReactingMultiphaseCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
@@ -48,7 +48,7 @@ Foam::basicReactingMultiphaseCloud::basicReactingMultiphaseCloud
:
ReactingMultiphaseCloud<basicReactingMultiphaseParcel>
(
- cloudType,
+ cloudName,
rho,
U,
g,
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
index e8a9485cb8ec6d183c0e37f82a61a25148101dab..0a34b333388fc1d0999306537d0747fab0a712aa 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
@@ -72,7 +72,7 @@ public:
//- Construct given carrier gas fields
basicReactingMultiphaseCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.C b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.C
index 9d73a6533c91bc03c94cffec4dc767097feb565d..fc7ee7dc26eb80fbf66a701b839b8ef13a36fd25 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.C
@@ -38,14 +38,14 @@ namespace Foam
Foam::basicThermoCloud::basicThermoCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
basicThermo& thermo
)
:
- ThermoCloud<basicThermoParcel>(cloudType, rho, U, g, thermo)
+ ThermoCloud<basicThermoParcel>(cloudName, rho, U, g, thermo)
{
basicThermoParcel::readFields(*this);
}
diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
index e8ba4c9a8c4813377837ad46dfbca670bed01da1..81507f7098d2a97bcca8749fd151a77807819955 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
@@ -74,7 +74,7 @@ public:
//- Construct given carrier gas fields
basicThermoCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
diff --git a/src/lagrangian/intermediate/clouds/derived/trackedReactingCloud/trackedReactingCloud.C b/src/lagrangian/intermediate/clouds/derived/trackedReactingCloud/trackedReactingCloud.C
index 1b6378d0ceb9d3497cdb3912bdd117f51e16bdfe..24937a077358e32b87fb3b1109740c9ccb4e90cf 100644
--- a/src/lagrangian/intermediate/clouds/derived/trackedReactingCloud/trackedReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/derived/trackedReactingCloud/trackedReactingCloud.C
@@ -38,7 +38,7 @@ namespace Foam
Foam::trackedReactingCloud::trackedReactingCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,
@@ -48,7 +48,7 @@ Foam::trackedReactingCloud::trackedReactingCloud
:
ReactingCloud<trackedReactingParcel>
(
- cloudType,
+ cloudName,
rho,
U,
g,
diff --git a/src/lagrangian/intermediate/clouds/derived/trackedReactingCloud/trackedReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/trackedReactingCloud/trackedReactingCloud.H
index be9f01aa8b40cdfad65d848368fe9afaf5094e1e..490b918800052ec9122e4835bbdaa5f987c05f28 100644
--- a/src/lagrangian/intermediate/clouds/derived/trackedReactingCloud/trackedReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/trackedReactingCloud/trackedReactingCloud.H
@@ -72,7 +72,7 @@ public:
//- Construct given carrier gas fields
trackedReactingCloud
(
- const word& cloudType,
+ const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const dimensionedVector& g,