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

Thermodynamyics: rename basicThermo -> fluidThermo and veryBasicThermo -> basicThermo

Browse Source
This commit is contained in:
Henry
2012-08-23 14:13:13 +01:00
parent 26abc53885
commit 830c0ef382
179 changed files with 770 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/PDRFoam/Make/options
View File

@ -23,7 +23,7 @@ EXE_LIBS = \
-lmeshTools \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie \
-llaminarFlameSpeedModels \

2
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
View File

@ -50,7 +50,7 @@ PDRkEpsilon::PDRkEpsilon
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
const basicThermo& thermophysicalModel,
const fluidThermo& thermophysicalModel,
const word& turbulenceModelName,
const word& modelName
)

2
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
View File

@ -100,7 +100,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
const basicThermo& thermophysicalModel,
const fluidThermo& thermophysicalModel,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);

2
applications/solvers/combustion/XiFoam/Make/options
View File

@ -13,7 +13,7 @@ EXE_LIBS = \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie \
-llaminarFlameSpeedModels \

2
applications/solvers/combustion/chemFoam/Make/options
View File

@ -14,7 +14,7 @@ EXE_LIBS = \
-lfiniteVolume \
-lcompressibleRASModels \
-lreactionThermophysicalModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lchemistryModel \
-lODE \
-lthermophysicalFunctions \

2
applications/solvers/combustion/coldEngineFoam/Make/options
View File

@ -13,6 +13,6 @@ EXE_LIBS = \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lfiniteVolume

2
applications/solvers/combustion/engineFoam/Make/options
View File

@ -13,7 +13,7 @@ EXE_LIBS = \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie \
-llaminarFlameSpeedModels \

2
applications/solvers/combustion/fireFoam/Make/options
View File

@ -33,7 +33,7 @@ EXE_LIBS = \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \

2
applications/solvers/combustion/reactingFoam/Make/options
View File

@ -14,7 +14,7 @@ EXE_LIBS = \
-lcompressibleLESModels \
-lreactionThermophysicalModels \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lchemistryModel \
-lODE \
-lfiniteVolume \

2
applications/solvers/combustion/rhoReactingFoam/Make/options
View File

@ -16,7 +16,7 @@ EXE_LIBS = \
-lcompressibleLESModels \
-lreactionThermophysicalModels \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lchemistryModel \
-lODE \
-lfiniteVolume \

2
applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
View File

@ -5,6 +5,6 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie

2
applications/solvers/compressible/rhoCentralFoam/Make/options
View File

@ -9,7 +9,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lrhoCentralFoam \
-lcompressibleTurbulenceModel \

2
applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
View File

@ -10,7 +10,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lrhoCentralFoam \
-lcompressibleTurbulenceModel \

2
applications/solvers/compressible/rhoPimpleFoam/Make/options
View File

@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \

2
applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options
View File

@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \

2
applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options
View File

@ -8,7 +8,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \

2
applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options
View File

@ -7,7 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \

2
applications/solvers/compressible/rhoSimpleFoam/Make/options
View File

@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \

2
applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options
View File

@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lthermalPorousZone \
-lspecie \
-lcompressibleTurbulenceModel \

2
applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
View File

@ -7,7 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lfiniteVolume \

2
applications/solvers/compressible/sonicFoam/Make/options
View File

@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \

2
applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
View File

@ -7,7 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \

2
applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
View File

@ -5,7 +5,7 @@ EXE_INC = \
EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \

2
applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
View File

@ -7,7 +7,7 @@ EXE_INC = \
EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \

2
applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
View File

@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lradiationModels \
-lcompressibleTurbulenceModel \

2
applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
View File

@ -20,7 +20,7 @@ EXE_INC = \
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lsolidThermo \
-lspecie \
-lcompressibleTurbulenceModel \

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
View File

@ -19,7 +19,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lsolidThermo \
-lspecie \
-lcompressibleTurbulenceModel \

2
applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
View File

@ -34,7 +34,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \

2
applications/solvers/lagrangian/coalChemistryFoam/Make/options
View File

@ -37,7 +37,7 @@ EXE_LIBS = \
-llagrangianIntermediate \
-lcoalCombustion\
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \

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

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

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

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

2
applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
View File

@ -21,7 +21,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lthermophysicalFunctions \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lradiationModels \
-lincompressibleRASModels \

2
applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
View File

@ -17,7 +17,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lthermophysicalFunctions \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lradiationModels \
-lincompressibleRASModels \

2
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
View File

@ -35,7 +35,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \

2
applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
View File

@ -29,7 +29,7 @@ EXE_LIBS = \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \

2
applications/solvers/lagrangian/reactingParcelFoam/Make/options
View File

@ -35,7 +35,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \

2
applications/solvers/lagrangian/sprayFoam/Make/options
View File

@ -37,7 +37,7 @@ EXE_LIBS = \
-llagrangianIntermediate \
-llagrangianSpray \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \

2
applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
View File

@ -39,7 +39,7 @@ EXE_LIBS = \
-llagrangianIntermediate \
-llagrangianSpray \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \

2
applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
View File

@ -15,7 +15,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lthermophysicalFunctions \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lradiationModels \
-lcompressibleTurbulenceModel \

2
applications/utilities/miscellaneous/foamDebugSwitches/Make/options
View File

@ -2,7 +2,7 @@ EXE_LIBS = \
-lautoMesh \
-lbarotropicCompressibilityModel \
-lsolidThermo \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lblockMesh \
-lchemistryModel \
-lcoalCombustion \

2
applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
View File

@ -11,7 +11,7 @@ EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lcompressibleLESModels \

4
applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
View File

@ -47,7 +47,7 @@ Description
#include "incompressible/RAS/RASModel/RASModel.H"
#include "incompressible/LES/LESModel/LESModel.H"
#include "basicThermo.H"
#include "fluidThermo.H"
#include "compressible/RAS/RASModel/RASModel.H"
#include "compressible/LES/LESModel/LESModel.H"
@ -265,7 +265,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
}
else if (phi.dimensions() == dimensionSet(1, 0, -1, 0, 0))
{
autoPtr<basicThermo> thermo(basicThermo::New(mesh));
autoPtr<fluidThermo> thermo(fluidThermo::New(mesh));
volScalarField rho
(

6
applications/utilities/postProcessing/velocityField/Mach/Mach.C
View File

@ -33,7 +33,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "calc.H"
#include "basicThermo.H"
#include "fluidThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -75,9 +75,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
)
{
// thermophysical Mach
autoPtr<basicThermo> thermo
autoPtr<fluidThermo> thermo
(
basicThermo::New(mesh)
fluidThermo::New(mesh)
);
volScalarField Cp(thermo->Cp());

2
applications/utilities/postProcessing/velocityField/Mach/Make/options
View File

@ -7,5 +7,5 @@ EXE_LIBS = \
$(FOAM_LIBBIN)/postCalc.o \
-lfiniteVolume \
-lgenericPatchFields \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie

4
applications/utilities/postProcessing/velocityField/Mach/thermophysicalMach.H
View File

@ -18,9 +18,9 @@
{
volVectorField U(Uheader, mesh);
autoPtr<basicThermo> thermo
autoPtr<fluidThermo> thermo
(
basicThermo::New(mesh)
fluidThermo::New(mesh)
);
volScalarField Cp = thermo->Cp();

2
applications/utilities/postProcessing/velocityField/Pe/Make/options
View File

@ -13,7 +13,7 @@ EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lcompressibleLESModels \

6
applications/utilities/postProcessing/velocityField/Pe/Pe.C
View File

@ -39,7 +39,7 @@ Description
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/RAS/RASModel/RASModel.H"
#include "incompressible/LES/LESModel/LESModel.H"
#include "basicThermo.H"
#include "fluidThermo.H"
#include "compressible/RAS/RASModel/RASModel.H"
#include "compressible/LES/LESModel/LESModel.H"
@ -204,7 +204,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
IOdictionary RASProperties(RASPropertiesHeader);
autoPtr<basicThermo> thermo(basicThermo::New(mesh));
autoPtr<fluidThermo> thermo(fluidThermo::New(mesh));
volScalarField rho
(
@ -252,7 +252,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
IOdictionary LESProperties(LESPropertiesHeader);
autoPtr<basicThermo> thermo(basicThermo::New(mesh));
autoPtr<fluidThermo> thermo(fluidThermo::New(mesh));
volScalarField rho
(

2
applications/utilities/postProcessing/wall/solidWallHeatFlux/Make/options
View File

@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lsolidThermo \
-lspecie \
-lfiniteVolume \

2
applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
View File

@ -14,5 +14,5 @@ EXE_LIBS = \
-lgenericPatchFields \
-lspecie \
-lsolid \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lsolidThermo

8
applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
View File

@ -1,6 +1,6 @@
autoPtr<veryBasicThermo> thermo
autoPtr<basicThermo> thermo
(
veryBasicThermo::New(mesh)
basicThermo::New(mesh)
);
const volScalarField& h = thermo->he();
@ -22,7 +22,7 @@ autoPtr<volVectorField> UPtr;
autoPtr<surfaceScalarField> phiPtr;
autoPtr<compressible::turbulenceModel> turbulence;
if (isA<basicThermo>(thermo()))
if (isA<fluidThermo>(thermo()))
{
UPtr.reset
(
@ -51,6 +51,6 @@ if (isA<basicThermo>(thermo()))
rho,
U,
phiPtr(),
refCast<const basicThermo>(thermo())
refCast<const fluidThermo>(thermo())
);
}

2
applications/utilities/postProcessing/wall/wallShearStress/Make/options
View File

@ -7,7 +7,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleRASModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lfiniteVolume \

6
applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
View File

@ -38,7 +38,7 @@ Description
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/RAS/RASModel/RASModel.H"
#include "basicThermo.H"
#include "fluidThermo.H"
#include "compressible/RAS/RASModel/RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -101,8 +101,8 @@ void calcCompressible
#include "compressibleCreatePhi.H"
autoPtr<basicThermo> pThermo(basicThermo::New(mesh));
basicThermo& thermo = pThermo();
autoPtr<fluidThermo> pThermo(fluidThermo::New(mesh));
fluidThermo& thermo = pThermo();
autoPtr<compressible::RASModel> model
(

2
applications/utilities/postProcessing/wall/yPlusRAS/Make/options
View File

@ -10,7 +10,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleRASModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lfiniteVolume \

8
applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
View File

@ -39,7 +39,7 @@ Description
#include "incompressible/RAS/RASModel/RASModel.H"
#include "nutWallFunction/nutWallFunctionFvPatchScalarField.H"
#include "basicThermo.H"
#include "fluidThermo.H"
#include "compressible/RAS/RASModel/RASModel.H"
#include "mutWallFunction/mutWallFunctionFvPatchScalarField.H"
@ -130,11 +130,11 @@ void calcCompressibleYPlus
#include "compressibleCreatePhi.H"
autoPtr<basicThermo> pThermo
autoPtr<fluidThermo> pThermo
(
basicThermo::New(mesh)
fluidThermo::New(mesh)
);
basicThermo& thermo = pThermo();
fluidThermo& thermo = pThermo();
autoPtr<compressible::RASModel> RASModel
(

2
applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options
View File

@ -6,7 +6,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleRASModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lfiniteVolume \

2
applications/utilities/thermophysical/chemkinToFoam/Make/options
View File

@ -4,5 +4,5 @@ EXE_INC = \
EXE_LIBS = \
-lreactionThermophysicalModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie

16
etc/controlDict
View File

@ -102,7 +102,7 @@ DebugSwitches
ChomiakInjector 0;
Cloud<basicKinematicParcel> 0;
Cloud<basicReactingParcel> 0;
Cloud<basicThermoParcel> 0;
Cloud<fluidThermoParcel> 0;
Cloud<indexedParticle> 0;
Cloud<parcel> 0;
Cloud<passiveParticle> 0;
@ -170,9 +170,9 @@ DebugSwitches
KRR4 0;
KinematicCloud<basicKinematicParcel> 0;
KinematicCloud<basicReactingParcel> 0;
KinematicCloud<basicThermoParcel> 0;
KinematicCloud<fluidThermoParcel> 0;
KinematicParcel<basicReactingParcel> 0;
KinematicParcel<basicThermoParcel> 0;
KinematicParcel<fluidThermoParcel> 0;
LESModel 0;
LESdelta 0;
LESfilter 0;
@ -280,9 +280,9 @@ DebugSwitches
TAB 0;
Table 0;
ThermoCloud<basicReactingParcel> 0;
ThermoCloud<basicThermoParcel> 0;
ThermoCloud<fluidThermoParcel> 0;
ThermoParcel<basicReactingParcel> 0;
ThermoParcel<basicThermoParcel> 0;
ThermoParcel<fluidThermoParcel> 0;
UMIST 0;
UMISTV 0;
UpwindFitData<cubicUpwindFitPolynomial> 0;
@ -321,9 +321,9 @@ DebugSwitches
basicMixture 0;
basicReactingCloud 0;
basicReactingParcel 0;
basicThermo 0;
basicThermoCloud 0;
basicThermoParcel 0;
fluidThermo 0;
fluidThermoCloud 0;
fluidThermoParcel 0;
biLinearFit 0;
binaryAbsorptionEmission 0;
blended 0;

6
src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "interRegionHeatTransferModel.H"
#include "basicThermo.H"
#include "fluidThermo.H"
#include "fvm.H"
#include "IObasicSourceList.H"
#include "zeroGradientFvPatchFields.H"
@ -203,8 +203,8 @@ void Foam::interRegionHeatTransferModel::addSup
if (h.dimensions() == dimEnergy/dimMass)
{
const basicThermo& primaryThermo =
mesh_.lookupObject<basicThermo>("thermophysicalProperties");
const fluidThermo& primaryThermo =
mesh_.lookupObject<fluidThermo>("thermophysicalProperties");
eEqn += htc_*Tmapped - fvm::Sp(htc_/primaryThermo.Cp(), h);

4
src/fieldSources/basicSource/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
View File

@ -108,8 +108,8 @@ calculateHtc()
"turbulenceModel"
);
const basicThermo& secondaryThermo =
secondaryMesh.lookupObject<basicThermo>
const fluidThermo& secondaryThermo =
secondaryMesh.lookupObject<fluidThermo>
(
"thermophysicalProperties"
);

2
src/lagrangian/coalCombustion/Make/options
View File

@ -27,7 +27,7 @@ LIB_LIBS = \
-llagrangianIntermediate \
-ldistributionModels \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \

2
src/lagrangian/intermediate/Make/files
View File

@ -25,7 +25,7 @@ $(KINEMATICCOLLIDINGPARCEL)/makeBasicKinematicCollidingParcelSubmodels.C
/* thermo parcel sub-models */
THERMOPARCEL=$(DERIVEDPARCELS)/basicThermoParcel
THERMOPARCEL=$(DERIVEDPARCELS)/fluidThermoParcel
$(THERMOPARCEL)/defineBasicThermoParcel.C
$(THERMOPARCEL)/makeBasicThermoParcelSubmodels.C

4
src/lagrangian/intermediate/Make/files.old
View File

@ -25,8 +25,8 @@ $(KINEMATICPARCEL)/defineBasicKinematicParcel.C
$(KINEMATICPARCEL)/makeBasicKinematicParcelSubmodels.C
/* thermo parcel sub-models */
THERMOPARCEL=$(DERIVEDPARCELS)/basicThermoParcel
$(THERMOPARCEL)/basicThermoParcel.C
THERMOPARCEL=$(DERIVEDPARCELS)/fluidThermoParcel
$(THERMOPARCEL)/fluidThermoParcel.C
$(THERMOPARCEL)/defineBasicThermoParcel.C
$(THERMOPARCEL)/makeBasicThermoParcelSubmodels.C

2
src/lagrangian/intermediate/Make/options
View File

@ -25,7 +25,7 @@ LIB_LIBS = \
-llagrangian \
-ldistributionModels \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \

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

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

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

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

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

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

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

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "basicThermoCloud.H"
#include "fluidThermoCloud.H"
#include "makeParcelCloudFunctionObjects.H"
@ -41,17 +41,17 @@ License
namespace Foam
{
makeParcelCloudFunctionObjects(basicThermoCloud);
makeParcelCloudFunctionObjects(fluidThermoCloud);
// Kinematic sub-models
makeThermoParcelForces(basicThermoCloud);
makeParcelDispersionModels(basicThermoCloud);
makeParcelInjectionModels(basicThermoCloud);
makeParcelPatchInteractionModels(basicThermoCloud);
makeThermoParcelForces(fluidThermoCloud);
makeParcelDispersionModels(fluidThermoCloud);
makeParcelInjectionModels(fluidThermoCloud);
makeParcelPatchInteractionModels(fluidThermoCloud);
// Thermo sub-models
makeParcelHeatTransferModels(basicThermoCloud);
makeParcelSurfaceFilmModels(basicThermoCloud);
makeParcelHeatTransferModels(fluidThermoCloud);
makeParcelSurfaceFilmModels(fluidThermoCloud);
}

2
src/lagrangian/spray/Make/options
View File

@ -27,7 +27,7 @@ LIB_LIBS = \
-llagrangianIntermediate \
-ldistributionModels \
-lspecie \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \

2
src/postProcessing/functionObjects/forces/Make/options
View File

@ -11,7 +11,7 @@ LIB_LIBS = \
-lincompressibleTransportModels \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lcompressibleLESModels \

8
src/postProcessing/functionObjects/forces/forces/forces.C
View File

@ -33,7 +33,7 @@ License
#include "incompressible/RAS/RASModel/RASModel.H"
#include "incompressible/LES/LESModel/LESModel.H"
#include "basicThermo.H"
#include "fluidThermo.H"
#include "compressible/RAS/RASModel/RASModel.H"
#include "compressible/LES/LESModel/LESModel.H"
@ -75,10 +75,10 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
return rho()*les.devReff();
}
else if (obr_.foundObject<basicThermo>("thermophysicalProperties"))
else if (obr_.foundObject<fluidThermo>("thermophysicalProperties"))
{
const basicThermo& thermo =
obr_.lookupObject<basicThermo>("thermophysicalProperties");
const fluidThermo& thermo =
obr_.lookupObject<fluidThermo>("thermophysicalProperties");
const volVectorField& U = obr_.lookupObject<volVectorField>(UName_);

2
src/postProcessing/functionObjects/utilities/Make/options
View File

@ -22,4 +22,4 @@ LIB_LIBS = \
-lincompressibleRASModels \
-lcompressibleLESModels \
-lincompressibleLESModels \
-lbasicThermophysicalModels
-lfluidThermophysicalModels

2
src/regionModels/pyrolysisModels/Make/options
View File

@ -21,7 +21,7 @@ LIB_LIBS = \
-lspecie \
-lspecie \
-lsolid \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lsolidChemistryModel \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \

2
src/regionModels/surfaceFilmModels/Make/options
View File

@ -19,7 +19,7 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lliquidProperties \
-lliquidMixtureProperties \

2
src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
View File

@ -38,7 +38,7 @@ Description
// Coupled BC.
neighbourFieldName T;
kappa basicThermo;
kappa fluidThermo;
KName none;

4
src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
View File

@ -35,7 +35,7 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::SLGThermo::SLGThermo(const fvMesh& mesh, basicThermo& thermo)
Foam::SLGThermo::SLGThermo(const fvMesh& mesh, fluidThermo& thermo)
:
MeshObject<fvMesh, SLGThermo>(mesh),
thermo_(thermo),
@ -91,7 +91,7 @@ Foam::SLGThermo::~SLGThermo()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
const Foam::basicThermo& Foam::SLGThermo::thermo() const
const Foam::fluidThermo& Foam::SLGThermo::thermo() const
{
return thermo_;
}

8
src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H
View File

@ -46,7 +46,7 @@ SourceFiles
#define SLGThermo_H
#include "MeshObject.H"
#include "basicThermo.H"
#include "fluidThermo.H"
#include "basicMultiComponentMixture.H"
#include "liquidMixtureProperties.H"
#include "solidMixtureProperties.H"
@ -67,7 +67,7 @@ class SLGThermo
// Private data
//- Thermo package
basicThermo& thermo_;
fluidThermo& thermo_;
//- Reference to the multi-component carrier phase thermo
basicMultiComponentMixture* carrier_;
@ -87,7 +87,7 @@ public:
// Constructors
//- Construct from mesh
SLGThermo(const fvMesh& mesh, basicThermo& thermo);
SLGThermo(const fvMesh& mesh, fluidThermo& thermo);
//- Destructor
@ -99,7 +99,7 @@ public:
// Access
//- Return reference to the thermo database
const basicThermo& thermo() const;
const fluidThermo& thermo() const;
//- Return reference to the gaseous components
const basicMultiComponentMixture& carrier() const;

8
src/thermophysicalModels/basic/Make/files
View File

@ -1,12 +1,12 @@
mixtures/basicMixture/basicMixture.C
mixtures/basicMixture/basicMixtures.C
basicThermo/veryBasicThermo.C
basicThermo/veryBasicThermoNew.C
basicThermo/basicThermo.C
basicThermo/basicThermoNew.C
fluidThermo/fluidThermo.C
fluidThermo/fluidThermoNew.C
psiThermo/psiThermo/psiThermo.C
psiThermo/psiThermo/psiThermoNew.C
psiThermo/hePsiThermo/hePsiThermos.C
@ -22,4 +22,4 @@ derivedFvPatchFields/energyJump/energyJumpFvPatchScalarField.C
derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libbasicThermophysicalModels
LIB = $(FOAM_LIBBIN)/libfluidThermophysicalModels

144
src/thermophysicalModels/basic/basicThermo/basicThermo.C
View File

@ -25,6 +25,7 @@ License
#include "basicThermo.H"
/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
namespace Foam
@ -38,14 +39,119 @@ namespace Foam
Foam::basicThermo::basicThermo(const fvMesh& mesh)
:
veryBasicThermo(mesh)
IOdictionary
(
IOobject
(
"thermophysicalProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
p_
(
IOobject
(
"p",
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
),
T_
(
IOobject
(
"T",
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
),
alpha_
(
IOobject
(
"alpha",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh,
dimensionSet(1, -1, -1, 0, 0)
)
{}
Foam::basicThermo::basicThermo(const fvMesh& mesh, const dictionary& dict)
Foam::basicThermo::basicThermo
(
const fvMesh& mesh,
const dictionary& dict
)
:
veryBasicThermo(mesh, dict)
IOdictionary
(
IOobject
(
"thermophysicalProperties",
mesh.time().constant(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
dict
),
p_
(
IOobject
(
"p",
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
),
T_
(
IOobject
(
"T",
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
),
alpha_
(
IOobject
(
"alpha",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh,
dimensionSet(1, -1, -1, 0, 0)
)
{}
@ -55,4 +161,36 @@ Foam::basicThermo::~basicThermo()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::volScalarField& Foam::basicThermo::p()
{
return p_;
}
const Foam::volScalarField& Foam::basicThermo::p() const
{
return p_;
}
const Foam::volScalarField& Foam::basicThermo::T() const
{
return T_;
}
const Foam::volScalarField& Foam::basicThermo::alpha() const
{
return alpha_;
}
bool Foam::basicThermo::read()
{
return regIOobject::read();
}
// ************************************************************************* //

193
src/thermophysicalModels/basic/basicThermo/basicThermo.H
View File

@ -36,7 +36,10 @@ SourceFiles
#ifndef basicThermo_H
#define basicThermo_H
#include "veryBasicThermo.H"
#include "volFields.H"
#include "typeInfo.H"
#include "IOdictionary.H"
#include "autoPtr.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -49,9 +52,29 @@ namespace Foam
class basicThermo
:
public veryBasicThermo
public IOdictionary
{
protected:
// Protected data
// Fields
//- Pressure [Pa]
volScalarField p_;
//- Temperature [K]
volScalarField T_;
//- Laminar thermal diffusuvity [kg/m/s]
volScalarField alpha_;
//- Construct as copy (not implemented)
basicThermo(const basicThermo&);
public:
//- Runtime type information
@ -86,16 +109,174 @@ public:
// Member functions
//- Update properties
virtual void correct() = 0;
// Access to thermodynamic state variables
//- Compressibility [s^2/m^2]
virtual const volScalarField& psi() const = 0;
//- Pressure [Pa]
// Non-const access allowed for transport equations
virtual volScalarField& p();
//- Pressure [Pa]
virtual const volScalarField& p() const;
//- Density [kg/m^3]
virtual tmp<volScalarField> rho() const = 0;
//- Enthalpy/Internal energy [J/kg]
// Non-const access allowed for transport equations
virtual volScalarField& he() = 0;
//- Enthalpy/Internal energy [J/kg]
virtual const volScalarField& he() const = 0;
//- Enthalpy/Internal energy for cell-set [J/kg]
virtual tmp<scalarField> he
(
const scalarField& p,
const scalarField& T,
const labelList& cells
) const = 0;
//- Enthalpy/Internal energy for patch [J/kg]
virtual tmp<scalarField> he
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
//- Chemical enthalpy [J/kg]
virtual tmp<volScalarField> hc() const = 0;
//- Temperature from enthalpy/internal energy for cell-set
virtual tmp<scalarField> THE
(
const scalarField& h,
const scalarField& p,
const scalarField& T0, // starting temperature
const labelList& cells
) const = 0;
//- Temperature from enthalpy/internal energy for patch
virtual tmp<scalarField> THE
(
const scalarField& h,
const scalarField& p,
const scalarField& T0, // starting temperature
const label patchi
) const = 0;
// Fields derived from thermodynamic state variables
//- Temperature [K]
virtual const volScalarField& T() const;
//- Heat capacity at constant pressure [J/kg/K]
virtual tmp<volScalarField> Cp() const = 0;
//- Heat capacity at constant pressure for patch [J/kg/K]
virtual tmp<scalarField> Cp
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
//- Heat capacity at constant volume [J/kg/K]
virtual tmp<volScalarField> Cv() const = 0;
//- Heat capacity at constant volume for patch [J/kg/K]
virtual tmp<scalarField> Cv
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
//- gamma = Cp/Cv []
virtual tmp<volScalarField> gamma() const = 0;
//- gamma = Cp/Cv for patch []
virtual tmp<scalarField> gamma
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
//- Heat capacity at constant pressure/volume [J/kg/K]
virtual tmp<volScalarField> Cpv() const = 0;
//- Heat capacity at constant pressure/volume for patch [J/kg/K]
virtual tmp<scalarField> Cpv
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
//- Heat capacity ratio []
virtual tmp<volScalarField> CpByCpv() const = 0;
//- Heat capacity ratio for patch []
virtual tmp<scalarField> CpByCpv
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
// Access to transport state variables
//- Dynamic viscosity of mixture [kg/m/s]
virtual const volScalarField& mu() const = 0;
//- Thermal diffusivity for enthalpy of mixture [kg/m/s]
virtual const volScalarField& alpha() const;
// Fields derived from transport state variables
//- Thermal diffusivity for temperature of mixture [J/m/s/K]
virtual tmp<volScalarField> kappa() const = 0;
//- Thermal diffusivity of mixture for patch [J/m/s/K]
virtual tmp<scalarField> kappa
(
const label patchi
) const = 0;
//- Effective thermal diffusivity of mixture [J/m/s/K]
virtual tmp<volScalarField> kappaEff
(
const volScalarField&
) const = 0;
//- Effective thermal diffusivity of mixture for patch [J/m/s/K]
virtual tmp<scalarField> kappaEff
(
const scalarField& alphat,
const label patchi
) const = 0;
//- Effective thermal diffusivity of mixture [J/m/s/K]
virtual tmp<volScalarField> alphaEff
(
const volScalarField& alphat
) const = 0;
//- Effective thermal diffusivity of mixture for patch [J/m/s/K]
virtual tmp<scalarField> alphaEff
(
const scalarField& alphat,
const label patchi
) const = 0;
//- Read thermophysicalProperties dictionary
virtual bool read();
};

196
src/thermophysicalModels/basic/basicThermo/veryBasicThermo.C
View File

@ -1,196 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "veryBasicThermo.H"
/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
namespace Foam
{
defineTypeNameAndDebug(veryBasicThermo, 0);
defineRunTimeSelectionTable(veryBasicThermo, fvMesh);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::veryBasicThermo::veryBasicThermo(const fvMesh& mesh)
:
IOdictionary
(
IOobject
(
"thermophysicalProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
p_
(
IOobject
(
"p",
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
),
T_
(
IOobject
(
"T",
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
),
alpha_
(
IOobject
(
"alpha",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh,
dimensionSet(1, -1, -1, 0, 0)
)
{}
Foam::veryBasicThermo::veryBasicThermo
(
const fvMesh& mesh,
const dictionary& dict
)
:
IOdictionary
(
IOobject
(
"thermophysicalProperties",
mesh.time().constant(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
dict
),
p_
(
IOobject
(
"p",
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
),
T_
(
IOobject
(
"T",
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
),
alpha_
(
IOobject
(
"alpha",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh,
dimensionSet(1, -1, -1, 0, 0)
)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::veryBasicThermo::~veryBasicThermo()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::volScalarField& Foam::veryBasicThermo::p()
{
return p_;
}
const Foam::volScalarField& Foam::veryBasicThermo::p() const
{
return p_;
}
const Foam::volScalarField& Foam::veryBasicThermo::T() const
{
return T_;
}
const Foam::volScalarField& Foam::veryBasicThermo::alpha() const
{
return alpha_;
}
bool Foam::veryBasicThermo::read()
{
return regIOobject::read();
}
// ************************************************************************* //

291
src/thermophysicalModels/basic/basicThermo/veryBasicThermo.H
View File

@ -1,291 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::veryBasicThermo
Description
Basic thermodynamic properties
SourceFiles
veryBasicThermo.C
veryBasicThermoNew.C
\*---------------------------------------------------------------------------*/
#ifndef veryBasicThermo_H
#define veryBasicThermo_H
#include "volFields.H"
#include "typeInfo.H"
#include "IOdictionary.H"
#include "autoPtr.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
/*---------------------------------------------------------------------------*\
Class veryBasicThermo Declaration
\*---------------------------------------------------------------------------*/
class veryBasicThermo
:
public IOdictionary
{
protected:
// Protected data
// Fields
//- Pressure [Pa]
volScalarField p_;
//- Temperature [K]
volScalarField T_;
//- Laminar thermal diffusuvity [kg/m/s]
volScalarField alpha_;
//- Construct as copy (not implemented)
veryBasicThermo(const veryBasicThermo&);
public:
//- Runtime type information
TypeName("veryBasicThermo");
//- Declare run-time constructor selection table
declareRunTimeSelectionTable
(
autoPtr,
veryBasicThermo,
fvMesh,
(const fvMesh& mesh),
(mesh)
);
// Constructors
//- Construct from mesh
veryBasicThermo(const fvMesh&);
//- Construct from mesh
veryBasicThermo(const fvMesh&, const dictionary&);
//- Selector
static autoPtr<veryBasicThermo> New(const fvMesh&);
//- Destructor
virtual ~veryBasicThermo();
// Member functions
//- Update properties
virtual void correct() = 0;
// Access to thermodynamic state variables
//- Pressure [Pa]
// Non-const access allowed for transport equations
virtual volScalarField& p();
//- Pressure [Pa]
virtual const volScalarField& p() const;
//- Density [kg/m^3]
virtual tmp<volScalarField> rho() const = 0;
//- Enthalpy/Internal energy [J/kg]
// Non-const access allowed for transport equations
virtual volScalarField& he() = 0;
//- Enthalpy/Internal energy [J/kg]
virtual const volScalarField& he() const = 0;
//- Enthalpy/Internal energy for cell-set [J/kg]
virtual tmp<scalarField> he
(
const scalarField& p,
const scalarField& T,
const labelList& cells
) const = 0;
//- Enthalpy/Internal energy for patch [J/kg]
virtual tmp<scalarField> he
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
//- Chemical enthalpy [J/kg]
virtual tmp<volScalarField> hc() const = 0;
//- Temperature from enthalpy/internal energy for cell-set
virtual tmp<scalarField> THE
(
const scalarField& h,
const scalarField& p,
const scalarField& T0, // starting temperature
const labelList& cells
) const = 0;
//- Temperature from enthalpy/internal energy for patch
virtual tmp<scalarField> THE
(
const scalarField& h,
const scalarField& p,
const scalarField& T0, // starting temperature
const label patchi
) const = 0;
// Fields derived from thermodynamic state variables
//- Temperature [K]
virtual const volScalarField& T() const;
//- Heat capacity at constant pressure [J/kg/K]
virtual tmp<volScalarField> Cp() const = 0;
//- Heat capacity at constant pressure for patch [J/kg/K]
virtual tmp<scalarField> Cp
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
//- Heat capacity at constant volume [J/kg/K]
virtual tmp<volScalarField> Cv() const = 0;
//- Heat capacity at constant volume for patch [J/kg/K]
virtual tmp<scalarField> Cv
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
//- gamma = Cp/Cv []
virtual tmp<volScalarField> gamma() const = 0;
//- gamma = Cp/Cv for patch []
virtual tmp<scalarField> gamma
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
//- Heat capacity at constant pressure/volume [J/kg/K]
virtual tmp<volScalarField> Cpv() const = 0;
//- Heat capacity at constant pressure/volume for patch [J/kg/K]
virtual tmp<scalarField> Cpv
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
//- Heat capacity ratio []
virtual tmp<volScalarField> CpByCpv() const = 0;
//- Heat capacity ratio for patch []
virtual tmp<scalarField> CpByCpv
(
const scalarField& p,
const scalarField& T,
const label patchi
) const = 0;
// Access to transport state variables
//- Thermal diffusivity for enthalpy of mixture [kg/m/s]
virtual const volScalarField& alpha() const;
// Fields derived from transport state variables
//- Thermal diffusivity for temperature of mixture [J/m/s/K]
virtual tmp<volScalarField> kappa() const = 0;
//- Thermal diffusivity of mixture for patch [J/m/s/K]
virtual tmp<scalarField> kappa
(
const label patchi
) const = 0;
//- Effective thermal diffusivity of mixture [J/m/s/K]
virtual tmp<volScalarField> kappaEff
(
const volScalarField&
) const = 0;
//- Effective thermal diffusivity of mixture for patch [J/m/s/K]
virtual tmp<scalarField> kappaEff
(
const scalarField& alphat,
const label patchi
) const = 0;
//- Effective thermal diffusivity of mixture [J/m/s/K]
virtual tmp<volScalarField> alphaEff
(
const volScalarField& alphat
) const = 0;
//- Effective thermal diffusivity of mixture for patch [J/m/s/K]
virtual tmp<scalarField> alphaEff
(
const scalarField& alphat,
const label patchi
) const = 0;
//- Read thermophysicalProperties dictionary
virtual bool read();
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

4
src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpFvPatchScalarField.C
View File

@ -26,7 +26,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "energyJumpFvPatchScalarField.H"
#include "temperatureJumpFvPatchScalarField.H"
#include "veryBasicThermo.H"
#include "basicThermo.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -103,7 +103,7 @@ void Foam::energyJumpFvPatchScalarField::updateCoeffs()
if (this->cyclicPatch().owner())
{
const veryBasicThermo& thermo = db().lookupObject<veryBasicThermo>
const basicThermo& thermo = db().lookupObject<basicThermo>
(
"thermophysicalProperties"
);

4
src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C
View File

@ -25,7 +25,7 @@ License
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "veryBasicThermo.H"
#include "basicThermo.H"
#include "addToRunTimeSelectionTable.H"
#include "fixedEnergyFvPatchScalarField.H"
@ -97,7 +97,7 @@ void Foam::fixedEnergyFvPatchScalarField::updateCoeffs()
return;
}
const veryBasicThermo& thermo = db().lookupObject<veryBasicThermo>
const basicThermo& thermo = db().lookupObject<basicThermo>
(
"thermophysicalProperties"
);

4
src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
View File

@ -27,7 +27,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "veryBasicThermo.H"
#include "basicThermo.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -97,7 +97,7 @@ void Foam::gradientEnergyFvPatchScalarField::updateCoeffs()
return;
}
const veryBasicThermo& thermo = db().lookupObject<veryBasicThermo>
const basicThermo& thermo = db().lookupObject<basicThermo>
(
"thermophysicalProperties"
);

4
src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C
View File

@ -27,7 +27,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "veryBasicThermo.H"
#include "basicThermo.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -102,7 +102,7 @@ void Foam::mixedEnergyFvPatchScalarField::updateCoeffs()
return;
}
const veryBasicThermo& thermo = db().lookupObject<veryBasicThermo>
const basicThermo& thermo = db().lookupObject<basicThermo>
(
"thermophysicalProperties"
);

4
src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
View File

@ -27,7 +27,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "veryBasicThermo.H"
#include "basicThermo.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -149,7 +149,7 @@ void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
return;
}
const veryBasicThermo& thermo = db().lookupObject<veryBasicThermo>
const basicThermo& thermo = db().lookupObject<basicThermo>
(
"thermophysicalProperties"
);

58
src/thermophysicalModels/basic/fluidThermo/fluidThermo.C Normal file
View File

@ -0,0 +1,58 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "fluidThermo.H"
/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
namespace Foam
{
defineTypeNameAndDebug(fluidThermo, 0);
defineRunTimeSelectionTable(fluidThermo, fvMesh);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fluidThermo::fluidThermo(const fvMesh& mesh)
:
basicThermo(mesh)
{}
Foam::fluidThermo::fluidThermo(const fvMesh& mesh, const dictionary& dict)
:
basicThermo(mesh, dict)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::fluidThermo::~fluidThermo()
{}
// ************************************************************************* //

110
src/thermophysicalModels/basic/fluidThermo/fluidThermo.H Normal file
View File

@ -0,0 +1,110 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::fluidThermo
Description
Basic thermodynamic properties
SourceFiles
fluidThermo.C
fluidThermoNew.C
\*---------------------------------------------------------------------------*/
#ifndef fluidThermo_H
#define fluidThermo_H
#include "basicThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
/*---------------------------------------------------------------------------*\
Class fluidThermo Declaration
\*---------------------------------------------------------------------------*/
class fluidThermo
:
public basicThermo
{
public:
//- Runtime type information
TypeName("fluidThermo");
//- Declare run-time constructor selection table
declareRunTimeSelectionTable
(
autoPtr,
fluidThermo,
fvMesh,
(const fvMesh& mesh),
(mesh)
);
// Constructors
//- Construct from mesh
fluidThermo(const fvMesh&);
//- Construct from mesh
fluidThermo(const fvMesh&, const dictionary&);
//- Selector
static autoPtr<fluidThermo> New(const fvMesh&);
//- Destructor
virtual ~fluidThermo();
// Member functions
// Access to thermodynamic state variables
//- Compressibility [s^2/m^2]
virtual const volScalarField& psi() const = 0;
// Access to transport state variables
//- Dynamic viscosity of mixture [kg/m/s]
virtual const volScalarField& mu() const = 0;
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

12
src/thermophysicalModels/basic/basicThermo/veryBasicThermoNew.C → src/thermophysicalModels/basic/fluidThermo/fluidThermoNew.C
View File

@ -23,11 +23,11 @@ License
\*---------------------------------------------------------------------------*/
#include "veryBasicThermo.H"
#include "fluidThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::veryBasicThermo> Foam::veryBasicThermo::New
Foam::autoPtr<Foam::fluidThermo> Foam::fluidThermo::New
(
const fvMesh& mesh
)
@ -57,14 +57,14 @@ Foam::autoPtr<Foam::veryBasicThermo> Foam::veryBasicThermo::New
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
FatalErrorIn("veryBasicThermo::New(const fvMesh&)")
<< "Unknown veryBasicThermo type " << modelType << nl << nl
<< "Valid veryBasicThermo types are:" << nl
FatalErrorIn("fluidThermo::New(const fvMesh&)")
<< "Unknown fluidThermo type " << modelType << nl << nl
<< "Valid fluidThermo types are:" << nl
<< fvMeshConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
return autoPtr<veryBasicThermo>(cstrIter()(mesh));
return autoPtr<fluidThermo>(cstrIter()(mesh));
}

6
src/thermophysicalModels/basic/basicThermo/makeThermo.H → src/thermophysicalModels/basic/fluidThermo/makeThermo.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
InClass
Foam::basicThermo
Foam::fluidThermo
Description
Macros for creating 'basic' density-based thermo packages
@ -83,7 +83,7 @@ addToRunTimeSelectionTable \
\
addToRunTimeSelectionTable \
( \
basicThermo, \
fluidThermo, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState, \
fvMesh \
);
@ -124,7 +124,7 @@ addToRunTimeSelectionTable \
\
addToRunTimeSelectionTable \
( \
basicThermo, \
fluidThermo, \
Cthermo##Mixture##icoPoly##Order##Type##ThermoPhysics, \
fvMesh \
);

2
src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C
View File

@ -38,7 +38,7 @@ namespace Foam
Foam::psiThermo::psiThermo(const fvMesh& mesh)
:
basicThermo(mesh),
fluidThermo(mesh),
psi_
(

4
src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef psiThermo_H
#define psiThermo_H
#include "basicThermo.H"
#include "fluidThermo.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -50,7 +50,7 @@ namespace Foam
class psiThermo
:
public basicThermo
public fluidThermo
{
protected:

4
src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C
View File

@ -38,7 +38,7 @@ namespace Foam
Foam::rhoThermo::rhoThermo(const fvMesh& mesh)
:
basicThermo(mesh),
fluidThermo(mesh),
rho_
(
IOobject
@ -85,7 +85,7 @@ Foam::rhoThermo::rhoThermo(const fvMesh& mesh)
Foam::rhoThermo::rhoThermo(const fvMesh& mesh, const dictionary& dict)
:
basicThermo(mesh, dict),
fluidThermo(mesh, dict),
rho_
(
IOobject

4
src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef rhoThermo_H
#define rhoThermo_H
#include "basicThermo.H"
#include "fluidThermo.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -50,7 +50,7 @@ namespace Foam
class rhoThermo
:
public basicThermo
public fluidThermo
{
protected:

2
src/thermophysicalModels/chemistryModel/Make/options
View File

@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude
LIB_LIBS = \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie \
-lthermophysicalFunctions \

2
src/thermophysicalModels/radiationModels/Make/options
View File

@ -14,7 +14,7 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lfluidThermophysicalModels \
-lspecie \
-lsolidThermo \
-lmeshTools \

2
src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C
View File

@ -142,7 +142,7 @@ void Foam::radiation::radiationModel::correct()
Foam::tmp<Foam::fvScalarMatrix> Foam::radiation::radiationModel::Sh
(
basicThermo& thermo
fluidThermo& thermo
) const
{
volScalarField& he = thermo.he();

4
src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H
View File

@ -45,7 +45,7 @@ SourceFiles
#include "autoPtr.H"
#include "runTimeSelectionTables.H"
#include "volFields.H"
#include "basicThermo.H"
#include "fluidThermo.H"
#include "fvMatrices.H"
#include "blackBodyEmission.H"
@ -177,7 +177,7 @@ public:
virtual tmp<DimensionedField<scalar, volMesh> > Ru() const = 0;
//- Energy source term
virtual tmp<fvScalarMatrix> Sh(basicThermo& thermo) const;
virtual tmp<fvScalarMatrix> Sh(fluidThermo& thermo) const;
};

2
src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
View File

@ -60,7 +60,7 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
speciesNames_(0),
specieIndex_(label(0)),
lookUpTablePtr_(),
thermo_(mesh.lookupObject<basicThermo>("thermophysicalProperties")),
thermo_(mesh.lookupObject<fluidThermo>("thermophysicalProperties")),
EhrrCoeff_(readScalar(coeffsDict_.lookup("EhrrCoeff"))),
Yj_(nSpecies_)
{

4
src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
View File

@ -89,7 +89,7 @@ SourceFiles
#include "absorptionEmissionModel.H"
#include "HashTable.H"
#include "absorptionCoeffs.H"
#include "basicThermo.H"
#include "fluidThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -134,7 +134,7 @@ private:
mutable autoPtr<interpolationLookUpTable<scalar> > lookUpTablePtr_;
//- SLG thermo package
const basicThermo& thermo_;
const fluidThermo& thermo_;
//- Emission constant coefficient
const scalar EhrrCoeff_;

Some files were not shown because too many files have changed in this diff Show More