From 620f16b06e492a1be8fe11ed92265a48469c602d Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 3 May 2013 10:42:36 +0100 Subject: [PATCH] BUG: Renamed fluidThermo[Cloud|Parcel] back to basicThermo[Cloud|Parcel] --- .../coalChemistryFoam/coalChemistryFoam.C | 2 +- .../coalChemistryFoam/createClouds.H | 2 +- .../basicThermoCloud.H} | 12 +++++----- .../basicThermoParcel.H} | 12 +++++----- .../defineBasicThermoParcel.C | 6 ++--- .../makeBasicThermoParcelSubmodels.C | 22 ++++++++++--------- 6 files changed, 29 insertions(+), 27 deletions(-) rename src/lagrangian/intermediate/clouds/derived/{fluidThermoCloud/fluidThermoCloud.H => basicThermoCloud/basicThermoCloud.H} (90%) rename src/lagrangian/intermediate/parcels/derived/{fluidThermoParcel/fluidThermoParcel.H => basicThermoParcel/basicThermoParcel.H} (88%) rename src/lagrangian/intermediate/parcels/derived/{fluidThermoParcel => basicThermoParcel}/defineBasicThermoParcel.C (89%) rename src/lagrangian/intermediate/parcels/derived/{fluidThermoParcel => basicThermoParcel}/makeBasicThermoParcelSubmodels.C (72%) diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index 208b7b9ce9..475e48a1cc 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "turbulenceModel.H" -#include "fluidThermoCloud.H" +#include "basicThermoCloud.H" #include "coalCloud.H" #include "psiCombustionModel.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createClouds.H b/applications/solvers/lagrangian/coalChemistryFoam/createClouds.H index 87c882c9a6..5dcfe1df4f 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createClouds.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createClouds.H @@ -9,7 +9,7 @@ coalCloud coalParcels ); Info<< "\nConstructing limestone cloud" << endl; -fluidThermoCloud limestoneParcels +basicThermoCloud limestoneParcels ( "limestoneCloud1", rho, diff --git a/src/lagrangian/intermediate/clouds/derived/fluidThermoCloud/fluidThermoCloud.H b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H similarity index 90% rename from src/lagrangian/intermediate/clouds/derived/fluidThermoCloud/fluidThermoCloud.H rename to src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H index 5f024b0ee0..6894a2964a 100644 --- a/src/lagrangian/intermediate/clouds/derived/fluidThermoCloud/fluidThermoCloud.H +++ b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H @@ -22,18 +22,18 @@ License along with OpenFOAM. If not, see . Class - Foam::fluidThermoCloud + Foam::basicThermoCloud Description Cloud class to introduce thermodynamic parcels \*---------------------------------------------------------------------------*/ -#ifndef fluidThermoCloud_H -#define fluidThermoCloud_H +#ifndef basicThermoCloud_H +#define basicThermoCloud_H #include "ThermoCloud.H" -#include "fluidThermoParcel.H" +#include "basicThermoParcel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,10 +45,10 @@ namespace Foam < Cloud < - fluidThermoParcel + basicThermoParcel > > - > fluidThermoCloud; + > basicThermoCloud; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/fluidThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H similarity index 88% rename from src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/fluidThermoParcel.H rename to src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H index 12e863b7b8..5deee9a015 100644 --- a/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/fluidThermoParcel.H +++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H @@ -22,18 +22,18 @@ License along with OpenFOAM. If not, see . Class - Foam::fluidThermoParcel + Foam::basicThermoParcel Description Definition of basic thermo parcel SourceFiles - fluidThermoParcel.C + basicThermoParcel.C \*---------------------------------------------------------------------------*/ -#ifndef fluidThermoParcel_H -#define fluidThermoParcel_H +#ifndef basicThermoParcel_H +#define basicThermoParcel_H #include "contiguous.H" #include "particle.H" @@ -44,10 +44,10 @@ SourceFiles namespace Foam { - typedef ThermoParcel > fluidThermoParcel; + typedef ThermoParcel > basicThermoParcel; template<> - inline bool contiguous() + inline bool contiguous() { return true; } diff --git a/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/defineBasicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C similarity index 89% rename from src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/defineBasicThermoParcel.C rename to src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C index 45381d280d..605fd6b2f7 100644 --- a/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/defineBasicThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C @@ -23,15 +23,15 @@ License \*---------------------------------------------------------------------------*/ -#include "fluidThermoParcel.H" +#include "basicThermoParcel.H" #include "Cloud.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - defineTemplateTypeNameAndDebug(fluidThermoParcel, 0); - defineTemplateTypeNameAndDebug(Cloud, 0); + defineTemplateTypeNameAndDebug(basicThermoParcel, 0); + defineTemplateTypeNameAndDebug(Cloud, 0); } // ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C similarity index 72% rename from src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/makeBasicThermoParcelSubmodels.C rename to src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C index 1a685395ae..ba6d30bb91 100644 --- a/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/makeBasicThermoParcelSubmodels.C +++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.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 @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "fluidThermoCloud.H" +#include "basicThermoCloud.H" #include "makeParcelCloudFunctionObjects.H" @@ -32,26 +32,28 @@ License #include "makeParcelDispersionModels.H" #include "makeParcelInjectionModels.H" #include "makeParcelPatchInteractionModels.H" +#include "makeParcelStochasticCollisionModels.H" +#include "makeThermoParcelSurfaceFilmModels.H" // thermo variant // Thermodynamic #include "makeParcelHeatTransferModels.H" -#include "makeThermoParcelSurfaceFilmModels.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - makeParcelCloudFunctionObjects(fluidThermoCloud); + makeParcelCloudFunctionObjects(basicThermoCloud); // Kinematic sub-models - makeThermoParcelForces(fluidThermoCloud); - makeParcelDispersionModels(fluidThermoCloud); - makeParcelInjectionModels(fluidThermoCloud); - makeParcelPatchInteractionModels(fluidThermoCloud); + makeThermoParcelForces(basicThermoCloud); + makeParcelDispersionModels(basicThermoCloud); + makeParcelInjectionModels(basicThermoCloud); + makeParcelPatchInteractionModels(basicThermoCloud); + makeParcelStochasticCollisionModels(basicThermoCloud); + makeParcelSurfaceFilmModels(basicThermoCloud); // Thermo sub-models - makeParcelHeatTransferModels(fluidThermoCloud); - makeParcelSurfaceFilmModels(fluidThermoCloud); + makeParcelHeatTransferModels(basicThermoCloud); }