zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: Renamed fluidThermo[Cloud|Parcel] back to basicThermo[Cloud|Parcel]

Browse Source
This commit is contained in:
andy
2013-05-03 10:42:36 +01:00
parent c52a2900e7
commit 620f16b06e
6 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
View File

@ -37,7 +37,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "turbulenceModel.H" #include "turbulenceModel.H"
#include "fluidThermoCloud.H" #include "basicThermoCloud.H"
#include "coalCloud.H" #include "coalCloud.H"
#include "psiCombustionModel.H" #include "psiCombustionModel.H"
#include "fvIOoptionList.H" #include "fvIOoptionList.H"

2
applications/solvers/lagrangian/coalChemistryFoam/createClouds.H
View File

@ -9,7 +9,7 @@ coalCloud coalParcels
); );
Info<< "\nConstructing limestone cloud" << endl; Info<< "\nConstructing limestone cloud" << endl;
fluidThermoCloud limestoneParcels basicThermoCloud limestoneParcels
( (
"limestoneCloud1", "limestoneCloud1",
rho, rho,

12
src/lagrangian/intermediate/clouds/derived/fluidThermoCloud/fluidThermoCloud.H → src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
View File

@ -22,18 +22,18 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fluidThermoCloud Foam::basicThermoCloud
Description Description
Cloud class to introduce thermodynamic parcels Cloud class to introduce thermodynamic parcels
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef fluidThermoCloud_H #ifndef basicThermoCloud_H
#define fluidThermoCloud_H #define basicThermoCloud_H
#include "ThermoCloud.H" #include "ThermoCloud.H"
#include "fluidThermoParcel.H" #include "basicThermoParcel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -45,10 +45,10 @@ namespace Foam
< <
Cloud Cloud
< <
fluidThermoParcel basicThermoParcel
> >
> >
> fluidThermoCloud; > basicThermoCloud;
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

12
src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/fluidThermoParcel.H → src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
View File

@ -22,18 +22,18 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fluidThermoParcel Foam::basicThermoParcel
Description Description
Definition of basic thermo parcel Definition of basic thermo parcel
SourceFiles SourceFiles
fluidThermoParcel.C basicThermoParcel.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef fluidThermoParcel_H #ifndef basicThermoParcel_H
#define fluidThermoParcel_H #define basicThermoParcel_H
#include "contiguous.H" #include "contiguous.H"
#include "particle.H" #include "particle.H"
@ -44,10 +44,10 @@ SourceFiles
namespace Foam namespace Foam
{ {
typedef ThermoParcel<KinematicParcel<particle> > fluidThermoParcel; typedef ThermoParcel<KinematicParcel<particle> > basicThermoParcel;
template<> template<>
inline bool contiguous<fluidThermoParcel>() inline bool contiguous<basicThermoParcel>()
{ {
return true; return true;
} }

6
src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/defineBasicThermoParcel.C → src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
View File

@ -23,15 +23,15 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "fluidThermoParcel.H" #include "basicThermoParcel.H"
#include "Cloud.H" #include "Cloud.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
defineTemplateTypeNameAndDebug(fluidThermoParcel, 0); defineTemplateTypeNameAndDebug(basicThermoParcel, 0);
defineTemplateTypeNameAndDebug(Cloud<fluidThermoParcel>, 0); defineTemplateTypeNameAndDebug(Cloud<basicThermoParcel>, 0);
} }
// ************************************************************************* // // ************************************************************************* //

22
src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/makeBasicThermoParcelSubmodels.C → src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "fluidThermoCloud.H" #include "basicThermoCloud.H"
#include "makeParcelCloudFunctionObjects.H" #include "makeParcelCloudFunctionObjects.H"
@ -32,26 +32,28 @@ License
#include "makeParcelDispersionModels.H" #include "makeParcelDispersionModels.H"
#include "makeParcelInjectionModels.H" #include "makeParcelInjectionModels.H"
#include "makeParcelPatchInteractionModels.H" #include "makeParcelPatchInteractionModels.H"
#include "makeParcelStochasticCollisionModels.H"
#include "makeThermoParcelSurfaceFilmModels.H" // thermo variant
// Thermodynamic // Thermodynamic
#include "makeParcelHeatTransferModels.H" #include "makeParcelHeatTransferModels.H"
#include "makeThermoParcelSurfaceFilmModels.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
makeParcelCloudFunctionObjects(fluidThermoCloud); makeParcelCloudFunctionObjects(basicThermoCloud);
// Kinematic sub-models // Kinematic sub-models
makeThermoParcelForces(fluidThermoCloud); makeThermoParcelForces(basicThermoCloud);
makeParcelDispersionModels(fluidThermoCloud); makeParcelDispersionModels(basicThermoCloud);
makeParcelInjectionModels(fluidThermoCloud); makeParcelInjectionModels(basicThermoCloud);
makeParcelPatchInteractionModels(fluidThermoCloud); makeParcelPatchInteractionModels(basicThermoCloud);
makeParcelStochasticCollisionModels(basicThermoCloud);
makeParcelSurfaceFilmModels(basicThermoCloud);
// Thermo sub-models // Thermo sub-models
makeParcelHeatTransferModels(fluidThermoCloud); makeParcelHeatTransferModels(basicThermoCloud);
makeParcelSurfaceFilmModels(fluidThermoCloud);
} }