From e009a15c836f0329db00afde5fee50c04ca5ccab Mon Sep 17 00:00:00 2001 From: andy <a.heather@opencfd.co.uk> Date: Fri, 22 May 2009 14:50:17 +0100 Subject: [PATCH] refactoring cloudType -> cloudName --- .../coalCombustion/coalCloud/coalCloud.C | 4 ++-- .../coalCombustion/coalCloud/coalCloud.H | 2 +- .../dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C | 16 ++++++++-------- .../dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H | 8 ++++---- .../dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H | 4 ++-- .../dsmc/clouds/derived/dsmcCloud/dsmcCloud.C | 8 ++++---- .../dsmc/clouds/derived/dsmcCloud/dsmcCloud.H | 4 ++-- .../Templates/KinematicCloud/KinematicCloud.C | 8 ++++---- .../Templates/KinematicCloud/KinematicCloud.H | 6 +++--- .../Templates/KinematicCloud/KinematicCloudI.H | 4 ++-- .../Templates/ReactingCloud/ReactingCloud.C | 4 ++-- .../Templates/ReactingCloud/ReactingCloud.H | 2 +- .../ReactingMultiphaseCloud.C | 4 ++-- .../ReactingMultiphaseCloud.H | 2 +- .../clouds/Templates/ThermoCloud/ThermoCloud.C | 4 ++-- .../clouds/Templates/ThermoCloud/ThermoCloud.H | 2 +- .../basicKinematicCloud/basicKinematicCloud.C | 4 ++-- .../basicKinematicCloud/basicKinematicCloud.H | 2 +- .../basicReactingCloud/basicReactingCloud.C | 4 ++-- .../basicReactingCloud/basicReactingCloud.H | 2 +- .../basicReactingMultiphaseCloud.C | 4 ++-- .../basicReactingMultiphaseCloud.H | 2 +- .../derived/basicThermoCloud/basicThermoCloud.C | 4 ++-- .../derived/basicThermoCloud/basicThermoCloud.H | 2 +- .../trackedReactingCloud/trackedReactingCloud.C | 4 ++-- .../trackedReactingCloud/trackedReactingCloud.H | 2 +- 26 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/lagrangian/coalCombustion/coalCloud/coalCloud.C b/src/lagrangian/coalCombustion/coalCloud/coalCloud.C index a8d1dd867b4..e41b822e38c 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 72949ce1444..4b1d3e852d7 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 53177e9afeb..30d7671fdbc 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 20bed1ee7b1..46634e6dd90 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 d39de4954fa..abc4b1d4c69 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 000ffcd53ef..d501dbf3d5d 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 2f88bbaad56..027ad2afec4 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 e4f7325be9f..0cd229d0350 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 94d55a5c61a..ba83febe3c9 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 4746efd7355..b477901d727 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 d9a0cb4eacf..2c8c8cc1ee5 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 848da636042..75badafeab9 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 126054dd69d..82c8e5daa87 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 d16577c03ae..bfd9b4816a9 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 abf956a8594..c7d43318e28 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 2e3aea4f23e..a5cba35617a 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 4e52274f8e0..4e58cfa767e 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 8a32780f351..91a8ae2e5bd 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 405dc4a6585..27c67a36ccd 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 7a56097614a..c6c6a625c0a 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 d174e0ea0ac..9bd8b9c772d 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 e8a9485cb8e..0a34b333388 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 9d73a6533c9..fc7ee7dc26e 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 e8ba4c9a8c4..81507f7098d 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 1b6378d0ceb..24937a07735 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 be9f01aa8b4..490b9188000 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, -- GitLab