Commit e009a15c authored by Andrew Heather's avatar Andrew Heather
Browse files

refactoring cloudType -> cloudName

parent 7c672a52
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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;
......
......@@ -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_;
}
......
......@@ -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)
{}
......
......@@ -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
);
......
......@@ -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,
......
......@@ -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;
......
......@@ -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_;
}
......
......@@ -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),
......
......@@ -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,
......
......@@ -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_
......
......@@ -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,
......
......@@ -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(),
......
......@@ -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,
......
......@@ -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);
}
......
......@@ -72,7 +72,7 @@ public:
//- Construct from components
basicKinematicCloud
(
const word& cloudType,
const word& cloudName,
const volScalarField& rho,
const volVectorField& U,
const volScalarField& mu,
......
......@@ -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,
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment