From 830c0ef382359cd00a1267d006d10830b7825715 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 23 Aug 2012 14:13:13 +0100
Subject: [PATCH] Thermodynamyics: rename basicThermo -> fluidThermo and
veryBasicThermo -> basicThermo
---
.../solvers/combustion/PDRFoam/Make/options | 2 +-
.../turbulence/PDRkEpsilon/PDRkEpsilon.C | 2 +-
.../turbulence/PDRkEpsilon/PDRkEpsilon.H | 2 +-
.../solvers/combustion/XiFoam/Make/options | 2 +-
.../solvers/combustion/chemFoam/Make/options | 2 +-
.../combustion/coldEngineFoam/Make/options | 2 +-
.../combustion/engineFoam/Make/options | 2 +-
.../solvers/combustion/fireFoam/Make/options | 2 +-
.../combustion/reactingFoam/Make/options | 2 +-
.../combustion/rhoReactingFoam/Make/options | 2 +-
.../rhoCentralFoam/BCs/Make/options | 2 +-
.../compressible/rhoCentralFoam/Make/options | 2 +-
.../rhoCentralDyMFoam/Make/options | 2 +-
.../compressible/rhoPimpleFoam/Make/options | 2 +-
.../rhoPimpleFoam/rhoPimplecFoam/Make/options | 2 +-
.../rhoPorousMRFLTSPimpleFoam/Make/options | 2 +-
.../rhoPorousMRFPimpleFoam/Make/options | 2 +-
.../compressible/rhoSimpleFoam/Make/options | 2 +-
.../rhoPorousMRFSimpleFoam/Make/options | 2 +-
.../rhoSimpleFoam/rhoSimplecFoam/Make/options | 2 +-
.../compressible/sonicFoam/Make/options | 2 +-
.../sonicFoam/sonicDyMFoam/Make/options | 2 +-
.../buoyantPimpleFoam/Make/options | 2 +-
.../buoyantSimpleFoam/Make/options | 2 +-
.../buoyantSimpleRadiationFoam/Make/options | 2 +-
.../chtMultiRegionFoam/Make/options | 2 +-
.../chtMultiRegionSimpleFoam/Make/options | 2 +-
.../LTSReactingParcelFoam/Make/options | 2 +-
.../lagrangian/coalChemistryFoam/Make/options | 2 +-
.../coalChemistryFoam/coalChemistryFoam.C | 2 +-
.../coalChemistryFoam/createClouds.H | 2 +-
.../Make/options | 2 +-
.../Make/options | 2 +-
.../Make/options | 2 +-
.../reactingParcelFilmFoam/Make/options | 2 +-
.../reactingParcelFoam/Make/options | 2 +-
.../solvers/lagrangian/sprayFoam/Make/options | 2 +-
.../sprayFoam/sprayEngineFoam/Make/options | 2 +-
.../uncoupledKinematicParcelFoam/Make/options | 2 +-
.../foamDebugSwitches/Make/options | 2 +-
.../execFlowFunctionObjects/Make/options | 2 +-
.../execFlowFunctionObjects.C | 4 +-
.../postProcessing/velocityField/Mach/Mach.C | 6 +-
.../velocityField/Mach/Make/options | 2 +-
.../velocityField/Mach/thermophysicalMach.H | 4 +-
.../velocityField/Pe/Make/options | 2 +-
.../postProcessing/velocityField/Pe/Pe.C | 6 +-
.../wall/solidWallHeatFlux/Make/options | 2 +-
.../wall/wallHeatFlux/Make/options | 2 +-
.../wall/wallHeatFlux/createFields.H | 8 +-
.../wall/wallShearStress/Make/options | 2 +-
.../wall/wallShearStress/wallShearStress.C | 6 +-
.../postProcessing/wall/yPlusRAS/Make/options | 2 +-
.../postProcessing/wall/yPlusRAS/yPlusRAS.C | 8 +-
.../Make/options | 2 +-
.../thermophysical/chemkinToFoam/Make/options | 2 +-
etc/controlDict | 16 +-
.../interRegionHeatTransferModel.C | 6 +-
.../variableHeatTransfer.C | 4 +-
src/lagrangian/coalCombustion/Make/options | 2 +-
src/lagrangian/intermediate/Make/files | 2 +-
src/lagrangian/intermediate/Make/files.old | 4 +-
src/lagrangian/intermediate/Make/options | 2 +-
.../fluidThermoCloud.H} | 12 +-
.../defineBasicThermoParcel.C | 6 +-
.../fluidThermoParcel.H} | 12 +-
.../makeBasicThermoParcelSubmodels.C | 16 +-
src/lagrangian/spray/Make/options | 2 +-
.../functionObjects/forces/Make/options | 2 +-
.../functionObjects/forces/forces/forces.C | 8 +-
.../functionObjects/utilities/Make/options | 2 +-
src/regionModels/pyrolysisModels/Make/options | 2 +-
.../surfaceFilmModels/Make/options | 2 +-
...emperatureThermoBaffleFvPatchScalarField.H | 2 +-
.../SLGThermo/SLGThermo/SLGThermo.C | 4 +-
.../SLGThermo/SLGThermo/SLGThermo.H | 8 +-
src/thermophysicalModels/basic/Make/files | 8 +-
.../basic/basicThermo/basicThermo.C | 144 ++++++++-
.../basic/basicThermo/basicThermo.H | 193 +++++++++++-
.../basic/basicThermo/veryBasicThermo.C | 196 ------------
.../basic/basicThermo/veryBasicThermo.H | 291 ------------------
.../energyJump/energyJumpFvPatchScalarField.C | 4 +-
.../fixedEnergyFvPatchScalarField.C | 4 +-
.../gradientEnergyFvPatchScalarField.C | 4 +-
.../mixedEnergyFvPatchScalarField.C | 4 +-
.../wallHeatTransferFvPatchScalarField.C | 4 +-
.../basic/fluidThermo/fluidThermo.C | 58 ++++
.../basic/fluidThermo/fluidThermo.H | 110 +++++++
.../fluidThermoNew.C} | 12 +-
.../{basicThermo => fluidThermo}/makeThermo.H | 6 +-
.../basic/psiThermo/psiThermo/psiThermo.C | 2 +-
.../basic/psiThermo/psiThermo/psiThermo.H | 4 +-
.../basic/rhoThermo/rhoThermo/rhoThermo.C | 4 +-
.../basic/rhoThermo/rhoThermo/rhoThermo.H | 4 +-
.../chemistryModel/Make/options | 2 +-
.../radiationModels/Make/options | 2 +-
.../radiationModel/radiationModel.C | 2 +-
.../radiationModel/radiationModel.H | 4 +-
.../greyMeanAbsorptionEmission.C | 2 +-
.../greyMeanAbsorptionEmission.H | 4 +-
.../wideBandAbsorptionEmission.C | 2 +-
.../wideBandAbsorptionEmission.H | 4 +-
.../solidThermo/Make/options | 2 +-
.../solidThermo/solidThermo/makeSolidThermo.H | 4 +-
.../solidThermo/solidThermo/solidThermo.C | 4 +-
.../solidThermo/solidThermo/solidThermo.H | 4 +-
.../thermalPorousZone/Make/options | 2 +-
.../fixedTemperature/fixedTemperature.C | 4 +-
.../fixedTemperature/fixedTemperature.H | 2 +-
.../noThermalModel/noThermalModel.C | 4 +-
.../noThermalModel/noThermalModel.H | 2 +-
.../thermalModel/thermalModel/thermalModel.H | 4 +-
.../thermalPorousZone/thermalPorousZone.C | 4 +-
.../thermalPorousZone/thermalPorousZone.H | 4 +-
.../thermalPorousZone/thermalPorousZones.C | 2 +-
.../thermalPorousZone/thermalPorousZones.H | 2 +-
.../DeardorffDiffStress/DeardorffDiffStress.C | 2 +-
.../DeardorffDiffStress/DeardorffDiffStress.H | 2 +-
.../LES/GenEddyVisc/GenEddyVisc.C | 2 +-
.../LES/GenEddyVisc/GenEddyVisc.H | 2 +-
.../LES/GenSGSStress/GenSGSStress.C | 2 +-
.../LES/GenSGSStress/GenSGSStress.H | 2 +-
.../compressible/LES/LESModel/LESModel.C | 6 +-
.../compressible/LES/LESModel/LESModel.H | 8 +-
.../LES/Smagorinsky/Smagorinsky.C | 2 +-
.../LES/Smagorinsky/Smagorinsky.H | 2 +-
.../LES/SpalartAllmaras/SpalartAllmaras.C | 2 +-
.../LES/SpalartAllmaras/SpalartAllmaras.H | 2 +-
.../homogeneousDynOneEqEddy.C | 2 +-
.../homogeneousDynOneEqEddy.H | 2 +-
.../LES/lowReOneEqEddy/lowReOneEqEddy.C | 2 +-
.../LES/lowReOneEqEddy/lowReOneEqEddy.H | 2 +-
.../compressible/LES/oneEqEddy/oneEqEddy.C | 2 +-
.../compressible/LES/oneEqEddy/oneEqEddy.H | 2 +-
.../compressible/RAS/LRR/LRR.C | 2 +-
.../compressible/RAS/LRR/LRR.H | 2 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 4 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 2 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 2 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 2 +-
.../compressible/RAS/Make/options | 2 +-
.../compressible/RAS/RASModel/RASModel.C | 6 +-
.../compressible/RAS/RASModel/RASModel.H | 8 +-
.../RAS/RNGkEpsilon/RNGkEpsilon.C | 2 +-
.../RAS/RNGkEpsilon/RNGkEpsilon.H | 2 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.C | 2 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.H | 2 +-
.../compressible/RAS/kEpsilon/kEpsilon.C | 2 +-
.../compressible/RAS/kEpsilon/kEpsilon.H | 2 +-
.../compressible/RAS/kOmegaSST/kOmegaSST.C | 2 +-
.../compressible/RAS/kOmegaSST/kOmegaSST.H | 2 +-
.../compressible/RAS/laminar/laminar.C | 2 +-
.../compressible/RAS/laminar/laminar.H | 2 +-
.../RAS/realizableKE/realizableKE.C | 2 +-
.../RAS/realizableKE/realizableKE.H | 2 +-
.../compressible/turbulenceModel/Make/options | 2 +-
.../temperatureCoupledBase.C | 4 +-
.../temperatureCoupledBase.H | 2 +-
...entHeatFluxTemperatureFvPatchScalarField.H | 2 +-
...tureCoupledBaffleMixedFvPatchScalarField.H | 2 +-
...eratureRadCoupledMixedFvPatchScalarField.H | 2 +-
.../turbulenceModel/laminar/laminar.C | 4 +-
.../turbulenceModel/laminar/laminar.H | 4 +-
.../turbulenceModel/turbulenceModel.C | 6 +-
.../turbulenceModel/turbulenceModel.H | 12 +-
.../derivedFvPatchFields/Make/options | 2 +-
.../fireFoam/les/oppositeBurningPanels/0/T | 2 +-
.../system/changeDictionaryDict.baffleRegion | 2 +-
.../system/bottomAir/changeDictionaryDict | 2 +-
.../system/topAir/changeDictionaryDict | 2 +-
.../system/bottomWater/changeDictionaryDict | 2 +-
.../bottomWater/changeDictionaryDict.save | 2 +-
.../system/topAir/changeDictionaryDict | 2 +-
.../system/bottomAir/changeDictionaryDict | 2 +-
.../system/topAir/changeDictionaryDict | 2 +-
.../system/bottomAir/changeDictionaryDict | 2 +-
.../system/topAir/changeDictionaryDict | 2 +-
.../system/bottomAir/changeDictionaryDict | 2 +-
.../system/topAir/changeDictionaryDict | 2 +-
179 files changed, 770 insertions(+), 770 deletions(-)
rename src/lagrangian/intermediate/clouds/derived/{basicThermoCloud/basicThermoCloud.H => fluidThermoCloud/fluidThermoCloud.H} (90%)
rename src/lagrangian/intermediate/parcels/derived/{basicThermoParcel => fluidThermoParcel}/defineBasicThermoParcel.C (89%)
rename src/lagrangian/intermediate/parcels/derived/{basicThermoParcel/basicThermoParcel.H => fluidThermoParcel/fluidThermoParcel.H} (88%)
rename src/lagrangian/intermediate/parcels/derived/{basicThermoParcel => fluidThermoParcel}/makeBasicThermoParcelSubmodels.C (81%)
delete mode 100644 src/thermophysicalModels/basic/basicThermo/veryBasicThermo.C
delete mode 100644 src/thermophysicalModels/basic/basicThermo/veryBasicThermo.H
create mode 100644 src/thermophysicalModels/basic/fluidThermo/fluidThermo.C
create mode 100644 src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
rename src/thermophysicalModels/basic/{basicThermo/veryBasicThermoNew.C => fluidThermo/fluidThermoNew.C} (86%)
rename src/thermophysicalModels/basic/{basicThermo => fluidThermo}/makeThermo.H (98%)
diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index b9937a8a698..135659c2766 100644
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@@ -23,7 +23,7 @@ EXE_LIBS = \
-lmeshTools \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie \
-llaminarFlameSpeedModels \
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 1e08ae11975..53ae252b9b4 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -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
)
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
index 68387c934a9..da5809d3b0b 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
@@ -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
);
diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options
index 66dae7fcb34..0812df5e3bf 100644
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@@ -13,7 +13,7 @@ EXE_LIBS = \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie \
-llaminarFlameSpeedModels \
diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options
index d5a7a75202f..7b95c2f16f7 100644
--- a/applications/solvers/combustion/chemFoam/Make/options
+++ b/applications/solvers/combustion/chemFoam/Make/options
@@ -14,7 +14,7 @@ EXE_LIBS = \
-lfiniteVolume \
-lcompressibleRASModels \
-lreactionThermophysicalModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lchemistryModel \
-lODE \
-lthermophysicalFunctions \
diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options
index dfd9248ded0..5af1f2fd617 100644
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@@ -13,6 +13,6 @@ EXE_LIBS = \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lfiniteVolume
diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/engineFoam/Make/options
index cf5fa5febe3..ff38fdf0519 100644
--- a/applications/solvers/combustion/engineFoam/Make/options
+++ b/applications/solvers/combustion/engineFoam/Make/options
@@ -13,7 +13,7 @@ EXE_LIBS = \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie \
-llaminarFlameSpeedModels \
diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index c75e2acbdb7..861bde659c1 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -33,7 +33,7 @@ EXE_LIBS = \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \
diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options
index 8eb6d4cabda..46b69a63cd5 100644
--- a/applications/solvers/combustion/reactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/Make/options
@@ -14,7 +14,7 @@ EXE_LIBS = \
-lcompressibleLESModels \
-lreactionThermophysicalModels \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lchemistryModel \
-lODE \
-lfiniteVolume \
diff --git a/applications/solvers/combustion/rhoReactingFoam/Make/options b/applications/solvers/combustion/rhoReactingFoam/Make/options
index 5a5df2ed7b6..8d18c083388 100644
--- a/applications/solvers/combustion/rhoReactingFoam/Make/options
+++ b/applications/solvers/combustion/rhoReactingFoam/Make/options
@@ -16,7 +16,7 @@ EXE_LIBS = \
-lcompressibleLESModels \
-lreactionThermophysicalModels \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lchemistryModel \
-lODE \
-lfiniteVolume \
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
index 999e0466cdc..6870682cf27 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
@@ -5,6 +5,6 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie
diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options
index b3be16a505b..4ddaa7fb971 100644
--- a/applications/solvers/compressible/rhoCentralFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lrhoCentralFoam \
-lcompressibleTurbulenceModel \
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
index 250effbee28..33707728f69 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
@@ -10,7 +10,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lrhoCentralFoam \
-lcompressibleTurbulenceModel \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options
index 47a62ae92a0..f21e7394e4d 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options
index d16a0ee1d88..6d3c41f0dfa 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options
index dcf5a81490f..5c83c910d95 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options
@@ -8,7 +8,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options
index 4067875fbc6..f01ebda533b 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options
@@ -7,7 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options
index 700a6a67535..339cc53bd9e 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options
index 14e73bf2a5c..2d328b3ed1f 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lthermalPorousZone \
-lspecie \
-lcompressibleTurbulenceModel \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
index 30c1e55d310..8a8553525f3 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
@@ -7,7 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lfiniteVolume \
diff --git a/applications/solvers/compressible/sonicFoam/Make/options b/applications/solvers/compressible/sonicFoam/Make/options
index a5b9436ac6e..f9c097c8748 100644
--- a/applications/solvers/compressible/sonicFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
index 73e3e02dc4a..263b9861edb 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
@@ -7,7 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
index 8d01214e6cf..db07a71c860 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
EXE_LIBS = \
-lmeshTools \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
index c8a3b02a0fa..74ddd124465 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@@ -7,7 +7,7 @@ EXE_INC = \
EXE_LIBS = \
-lmeshTools \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
index 96c99816d0f..f2ebc095ffc 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lradiationModels \
-lcompressibleTurbulenceModel \
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
index f2b077aa821..f5520125f78 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@@ -20,7 +20,7 @@ EXE_INC = \
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lsolidThermo \
-lspecie \
-lcompressibleTurbulenceModel \
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
index 2f1ae559fcc..d5c1e47394a 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@@ -19,7 +19,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lsolidThermo \
-lspecie \
-lcompressibleTurbulenceModel \
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
index bfe0fa7d39c..f87b446266f 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
@@ -34,7 +34,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index e008a3e3f53..adc629c4f2b 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -37,7 +37,7 @@ EXE_LIBS = \
-llagrangianIntermediate \
-lcoalCombustion\
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 7b9dff602e7..9cdd2b7295d 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 "basicThermoCloud.H"
+#include "fluidThermoCloud.H"
#include "coalCloud.H"
#include "psiCombustionModel.H"
#include "IObasicSourceList.H"
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createClouds.H b/applications/solvers/lagrangian/coalChemistryFoam/createClouds.H
index 5dcfe1df4fa..87c882c9a6a 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;
-basicThermoCloud limestoneParcels
+fluidThermoCloud limestoneParcels
(
"limestoneCloud1",
rho,
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
index f7bb7d2f2d2..4535f635dcd 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -21,7 +21,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lthermophysicalFunctions \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lradiationModels \
-lincompressibleRASModels \
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
index 9986f9f78bc..cb0f90524a5 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
@@ -17,7 +17,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lthermophysicalFunctions \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lradiationModels \
-lincompressibleRASModels \
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
index 7fc77306fd4..1f776f04125 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
@@ -35,7 +35,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index 5a1c428566a..a477abff475 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -29,7 +29,7 @@ EXE_LIBS = \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index ba327a029fc..6438a34c299 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -35,7 +35,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options
index 647a53c1b4e..0d5e4b6dd48 100644
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@@ -37,7 +37,7 @@ EXE_LIBS = \
-llagrangianIntermediate \
-llagrangianSpray \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
index f32b47478d1..d9ae7414b2b 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
@@ -39,7 +39,7 @@ EXE_LIBS = \
-llagrangianIntermediate \
-llagrangianSpray \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
index d302015a314..12c7c1c5511 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -15,7 +15,7 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-lthermophysicalFunctions \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lradiationModels \
-lcompressibleTurbulenceModel \
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index 2991254cdb6..43615129c97 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -2,7 +2,7 @@ EXE_LIBS = \
-lautoMesh \
-lbarotropicCompressibilityModel \
-lsolidThermo \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lblockMesh \
-lchemistryModel \
-lcoalCombustion \
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
index 66477ecd8e6..e42252ff31c 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
@@ -11,7 +11,7 @@ EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleRASModels \
-lincompressibleLESModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lcompressibleLESModels \
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 6531073136c..b133509318a 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -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
(
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Mach.C b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
index 3463175d772..45e286d247f 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@@ -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());
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Make/options b/applications/utilities/postProcessing/velocityField/Mach/Make/options
index c9733e397ac..d9cb09bedf3 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Mach/Make/options
@@ -7,5 +7,5 @@ EXE_LIBS = \
$(FOAM_LIBBIN)/postCalc.o \
-lfiniteVolume \
-lgenericPatchFields \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie
diff --git a/applications/utilities/postProcessing/velocityField/Mach/thermophysicalMach.H b/applications/utilities/postProcessing/velocityField/Mach/thermophysicalMach.H
index 4e4ea81b3d8..7125bd33af9 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/thermophysicalMach.H
+++ b/applications/utilities/postProcessing/velocityField/Mach/thermophysicalMach.H
@@ -18,9 +18,9 @@
{
volVectorField U(Uheader, mesh);
- autoPtr<basicThermo> thermo
+ autoPtr<fluidThermo> thermo
(
- basicThermo::New(mesh)
+ fluidThermo::New(mesh)
);
volScalarField Cp = thermo->Cp();
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options
index 7675f43a752..29d9b4d8c30 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options
@@ -13,7 +13,7 @@ EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleRASModels \
-lincompressibleLESModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lcompressibleLESModels \
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index c262482ce73..959eaad312d 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -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
(
diff --git a/applications/utilities/postProcessing/wall/solidWallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/solidWallHeatFlux/Make/options
index a06024973aa..7af7981bccd 100644
--- a/applications/utilities/postProcessing/wall/solidWallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/solidWallHeatFlux/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lsolidThermo \
-lspecie \
-lfiniteVolume \
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
index 36579d56ccf..38f94e13c79 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
@@ -14,5 +14,5 @@ EXE_LIBS = \
-lgenericPatchFields \
-lspecie \
-lsolid \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lsolidThermo
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H b/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
index 3a665ec2743..da7585b8317 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
@@ -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())
);
}
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
index b386fa45402..240bf953ba5 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -7,7 +7,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleRASModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lfiniteVolume \
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
index 83a1e57f42d..ce89695567e 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
+++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
@@ -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
(
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
index 55e668ee86e..27b70cae0a7 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
@@ -10,7 +10,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleRASModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lfiniteVolume \
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
index 5b0c4b4957f..2f8b1503418 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
@@ -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
(
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options
index 7a1f8e278d5..60692ce6739 100644
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options
+++ b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleRASModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lfiniteVolume \
diff --git a/applications/utilities/thermophysical/chemkinToFoam/Make/options b/applications/utilities/thermophysical/chemkinToFoam/Make/options
index 7fe5ba4077f..3a2cb8bce46 100644
--- a/applications/utilities/thermophysical/chemkinToFoam/Make/options
+++ b/applications/utilities/thermophysical/chemkinToFoam/Make/options
@@ -4,5 +4,5 @@ EXE_INC = \
EXE_LIBS = \
-lreactionThermophysicalModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie
diff --git a/etc/controlDict b/etc/controlDict
index 5550a0961a4..04ec43aca08 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -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;
diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
index 3135f89124b..1cd4178faf3 100644
--- a/src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
+++ b/src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
@@ -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);
diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C b/src/fieldSources/basicSource/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
index 030e91ea390..1c4c78a5eb5 100644
--- a/src/fieldSources/basicSource/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
+++ b/src/fieldSources/basicSource/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
@@ -108,8 +108,8 @@ calculateHtc()
"turbulenceModel"
);
- const basicThermo& secondaryThermo =
- secondaryMesh.lookupObject<basicThermo>
+ const fluidThermo& secondaryThermo =
+ secondaryMesh.lookupObject<fluidThermo>
(
"thermophysicalProperties"
);
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 2b9ab5fb778..34a2babd735 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -27,7 +27,7 @@ LIB_LIBS = \
-llagrangianIntermediate \
-ldistributionModels \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 9165621d6c9..ae4c1f9d660 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -25,7 +25,7 @@ $(KINEMATICCOLLIDINGPARCEL)/makeBasicKinematicCollidingParcelSubmodels.C
/* thermo parcel sub-models */
-THERMOPARCEL=$(DERIVEDPARCELS)/basicThermoParcel
+THERMOPARCEL=$(DERIVEDPARCELS)/fluidThermoParcel
$(THERMOPARCEL)/defineBasicThermoParcel.C
$(THERMOPARCEL)/makeBasicThermoParcelSubmodels.C
diff --git a/src/lagrangian/intermediate/Make/files.old b/src/lagrangian/intermediate/Make/files.old
index b5ccca4ed27..63909004cd9 100644
--- a/src/lagrangian/intermediate/Make/files.old
+++ b/src/lagrangian/intermediate/Make/files.old
@@ -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
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index e775c173b75..f4e774028ee 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -25,7 +25,7 @@ LIB_LIBS = \
-llagrangian \
-ldistributionModels \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H b/src/lagrangian/intermediate/clouds/derived/fluidThermoCloud/fluidThermoCloud.H
similarity index 90%
rename from src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
rename to src/lagrangian/intermediate/clouds/derived/fluidThermoCloud/fluidThermoCloud.H
index 7d05012b852..ff99635cfc6 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/fluidThermoCloud/fluidThermoCloud.H
@@ -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;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/defineBasicThermoParcel.C
similarity index 89%
rename from src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
rename to src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/defineBasicThermoParcel.C
index 2c2249da024..5d6997be822 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/defineBasicThermoParcel.C
@@ -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);
}
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/fluidThermoParcel.H
similarity index 88%
rename from src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
rename to src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/fluidThermoParcel.H
index bff4d221e2b..ba8dcfe66c1 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/fluidThermoParcel.H
@@ -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;
}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/makeBasicThermoParcelSubmodels.C
similarity index 81%
rename from src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
rename to src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/makeBasicThermoParcelSubmodels.C
index 59286ec1570..042469f8a99 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/fluidThermoParcel/makeBasicThermoParcelSubmodels.C
@@ -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);
}
diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options
index 2b9ab5fb778..34a2babd735 100644
--- a/src/lagrangian/spray/Make/options
+++ b/src/lagrangian/spray/Make/options
@@ -27,7 +27,7 @@ LIB_LIBS = \
-llagrangianIntermediate \
-ldistributionModels \
-lspecie \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
diff --git a/src/postProcessing/functionObjects/forces/Make/options b/src/postProcessing/functionObjects/forces/Make/options
index 72bbb01e6b4..afc10fb1aad 100644
--- a/src/postProcessing/functionObjects/forces/Make/options
+++ b/src/postProcessing/functionObjects/forces/Make/options
@@ -11,7 +11,7 @@ LIB_LIBS = \
-lincompressibleTransportModels \
-lincompressibleRASModels \
-lincompressibleLESModels \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-lcompressibleLESModels \
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index ff9ba3a4e3e..cf835d66ef6 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -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_);
diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index 9acdda40ef3..61713e09134 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@@ -22,4 +22,4 @@ LIB_LIBS = \
-lincompressibleRASModels \
-lcompressibleLESModels \
-lincompressibleLESModels \
- -lbasicThermophysicalModels
+ -lfluidThermophysicalModels
diff --git a/src/regionModels/pyrolysisModels/Make/options b/src/regionModels/pyrolysisModels/Make/options
index 3ce28824341..6f12d7c8eee 100644
--- a/src/regionModels/pyrolysisModels/Make/options
+++ b/src/regionModels/pyrolysisModels/Make/options
@@ -21,7 +21,7 @@ LIB_LIBS = \
-lspecie \
-lspecie \
-lsolid \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lsolidChemistryModel \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options
index 6543081f228..fc580a43f80 100644
--- a/src/regionModels/surfaceFilmModels/Make/options
+++ b/src/regionModels/surfaceFilmModels/Make/options
@@ -19,7 +19,7 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
-lmeshTools \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lliquidProperties \
-lliquidMixtureProperties \
diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
index 44b4d4fcd1f..386680807e2 100644
--- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
@@ -38,7 +38,7 @@ Description
// Coupled BC.
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
KName none;
diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
index c6b9647ff77..d041b7ab9d2 100644
--- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
+++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
@@ -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_;
}
diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H
index 2460ee5821c..c780fd3119f 100644
--- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H
+++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H
@@ -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;
diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files
index 688351b4ffa..f49b474762a 100644
--- a/src/thermophysicalModels/basic/Make/files
+++ b/src/thermophysicalModels/basic/Make/files
@@ -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
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index 73fb45fc3d3..4c2a383e63d 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -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();
+}
+
+
// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
index e1ebf3c33ce..9bdb96e2e3d 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@@ -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();
};
diff --git a/src/thermophysicalModels/basic/basicThermo/veryBasicThermo.C b/src/thermophysicalModels/basic/basicThermo/veryBasicThermo.C
deleted file mode 100644
index aa44725f543..00000000000
--- a/src/thermophysicalModels/basic/basicThermo/veryBasicThermo.C
+++ /dev/null
@@ -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();
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/basicThermo/veryBasicThermo.H b/src/thermophysicalModels/basic/basicThermo/veryBasicThermo.H
deleted file mode 100644
index cc06c754475..00000000000
--- a/src/thermophysicalModels/basic/basicThermo/veryBasicThermo.H
+++ /dev/null
@@ -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
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpFvPatchScalarField.C
index 894ab3d8fad..d3ba1becdd8 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpFvPatchScalarField.C
@@ -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"
);
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C
index 8584ddf4d16..3dd72e1e685 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C
@@ -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"
);
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
index 9398af885b7..42ed096ea60 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
@@ -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"
);
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C
index 4ee126e24ae..af83cfd20e9 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C
@@ -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"
);
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
index d0f8315b2e0..681f1c36a19 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
@@ -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"
);
diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C
new file mode 100644
index 00000000000..e62ae73c659
--- /dev/null
+++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C
@@ -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()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
new file mode 100644
index 00000000000..b7c964fc005
--- /dev/null
+++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
@@ -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
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/basicThermo/veryBasicThermoNew.C b/src/thermophysicalModels/basic/fluidThermo/fluidThermoNew.C
similarity index 86%
rename from src/thermophysicalModels/basic/basicThermo/veryBasicThermoNew.C
rename to src/thermophysicalModels/basic/fluidThermo/fluidThermoNew.C
index 64e2fd481da..d6977a542a0 100644
--- a/src/thermophysicalModels/basic/basicThermo/veryBasicThermoNew.C
+++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermoNew.C
@@ -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));
}
diff --git a/src/thermophysicalModels/basic/basicThermo/makeThermo.H b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
similarity index 98%
rename from src/thermophysicalModels/basic/basicThermo/makeThermo.H
rename to src/thermophysicalModels/basic/fluidThermo/makeThermo.H
index 06a65304c25..41ab0bdf667 100644
--- a/src/thermophysicalModels/basic/basicThermo/makeThermo.H
+++ b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
@@ -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 \
);
diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C
index fa2f90fe304..134103106e6 100644
--- a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C
@@ -38,7 +38,7 @@ namespace Foam
Foam::psiThermo::psiThermo(const fvMesh& mesh)
:
- basicThermo(mesh),
+ fluidThermo(mesh),
psi_
(
diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H
index 7f2bcde6c7b..990341965d7 100644
--- a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H
+++ b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H
@@ -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:
diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C
index 419eab0708c..a43347cb913 100644
--- a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C
@@ -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
diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H
index 2a32ea049ab..9cb27bd4b8d 100644
--- a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H
+++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H
@@ -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:
diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options
index 3cdfbc22ac4..b8f70e8dfac 100644
--- a/src/thermophysicalModels/chemistryModel/Make/options
+++ b/src/thermophysicalModels/chemistryModel/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude
LIB_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie \
-lthermophysicalFunctions \
diff --git a/src/thermophysicalModels/radiationModels/Make/options b/src/thermophysicalModels/radiationModels/Make/options
index 322cd015915..248131e32ed 100644
--- a/src/thermophysicalModels/radiationModels/Make/options
+++ b/src/thermophysicalModels/radiationModels/Make/options
@@ -14,7 +14,7 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lsolidThermo \
-lmeshTools \
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C
index cba6035e8fd..1664d8edd17 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C
@@ -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();
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H
index 9b02340acf0..b9963f0f70a 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H
+++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H
@@ -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;
};
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index d1a924ad11e..c6c724ad78b 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -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_)
{
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
index 32a20fe0a8f..cf016b79221 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
@@ -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_;
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index dcaf7f01f60..e0926fb8d1d 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -62,7 +62,7 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
mesh.time().constant(),
mesh
),
- thermo_(mesh.lookupObject<basicThermo>("thermophysicalProperties")),
+ thermo_(mesh.lookupObject<fluidThermo>("thermophysicalProperties")),
Yj_(nSpecies_),
totalWaveLength_(0)
{
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H
index ae32678cc7c..e28564adbf6 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H
@@ -106,7 +106,7 @@ SourceFiles
#include "absorptionEmissionModel.H"
#include "HashTable.H"
#include "absorptionCoeffs.H"
-#include "basicThermo.H"
+#include "fluidThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -160,7 +160,7 @@ private:
mutable interpolationLookUpTable<scalar> lookUpTable_;
//- Thermo package
- const basicThermo& thermo_;
+ const fluidThermo& thermo_;
//- Bands
label nBands_;
diff --git a/src/thermophysicalModels/solidThermo/Make/options b/src/thermophysicalModels/solidThermo/Make/options
index 8dfd16b7053..356a2ba06ed 100644
--- a/src/thermophysicalModels/solidThermo/Make/options
+++ b/src/thermophysicalModels/solidThermo/Make/options
@@ -10,4 +10,4 @@ LIB_LIBS = \
-lfiniteVolume \
-lspecie \
-lsolidSpecie \
- -lbasicThermophysicalModels
+ -lfluidThermophysicalModels
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
index 3173bd5c308..6ff422db118 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
@@ -33,7 +33,7 @@ Description
#define makesolidThermo_H
#include "addToRunTimeSelectionTable.H"
-#include "veryBasicThermo.H"
+#include "basicThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@@ -131,7 +131,7 @@ addToRunTimeSelectionTable \
); \
addToRunTimeSelectionTable \
( \
- veryBasicThermo, \
+ basicThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo##Rho##BaseThermo, \
fvMesh \
); \
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C
index fb8c15620e3..e5bb9fa2741 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C
@@ -41,7 +41,7 @@ namespace Foam
Foam::solidThermo::solidThermo(const fvMesh& mesh)
:
- veryBasicThermo(mesh),
+ basicThermo(mesh),
rho_
(
IOobject
@@ -64,7 +64,7 @@ Foam::solidThermo::solidThermo
const dictionary& dict
)
:
- veryBasicThermo(mesh, dict),
+ basicThermo(mesh, dict),
rho_
(
IOobject
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
index 398debb7260..62fbbeba7e8 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
@@ -41,7 +41,7 @@ SourceFiles
#include "IOdictionary.H"
#include "autoPtr.H"
#include "basicSolidMixture.H"
-#include "veryBasicThermo.H"
+#include "basicThermo.H"
#include "autoPtr.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,7 +55,7 @@ namespace Foam
class solidThermo
:
- public veryBasicThermo
+ public basicThermo
{
protected:
diff --git a/src/thermophysicalModels/thermalPorousZone/Make/options b/src/thermophysicalModels/thermalPorousZone/Make/options
index ca2d6183be3..d407126e2aa 100644
--- a/src/thermophysicalModels/thermalPorousZone/Make/options
+++ b/src/thermophysicalModels/thermalPorousZone/Make/options
@@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
LIB_LIBS = \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lmeshTools \
-lfiniteVolume
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
index 47cfe67dcd4..b7fee865202 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
@@ -25,7 +25,7 @@ License
#include "fixedTemperature.H"
#include "addToRunTimeSelectionTable.H"
-#include "basicThermo.H"
+#include "fluidThermo.H"
#include "volFields.H"
#include "fvMatrices.H"
@@ -66,7 +66,7 @@ Foam::porousMedia::fixedTemperature::~fixedTemperature()
void Foam::porousMedia::fixedTemperature::addEnergySource
(
- const basicThermo& thermo,
+ const fluidThermo& thermo,
const volScalarField& rho,
fvScalarMatrix& hEqn
) const
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
index b8932dd2e49..f28317a9d45 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
@@ -80,7 +80,7 @@ public:
//- Add the thermal source to the enthalpy equation
virtual void addEnergySource
(
- const basicThermo&,
+ const fluidThermo&,
const volScalarField& rho,
fvScalarMatrix& hEqn
) const;
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
index 7a5a1be53e3..4beef65f4fa 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
@@ -25,7 +25,7 @@ License
#include "noThermalModel.H"
#include "addToRunTimeSelectionTable.H"
-#include "basicThermo.H"
+#include "fluidThermo.H"
#include "volFields.H"
#include "fvMatrices.H"
@@ -65,7 +65,7 @@ Foam::porousMedia::noThermalModel::~noThermalModel()
void Foam::porousMedia::noThermalModel::addEnergySource
(
- const basicThermo&,
+ const fluidThermo&,
const volScalarField&,
fvScalarMatrix&
) const
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
index bad8b4dae01..1b9c1d8b832 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
@@ -72,7 +72,7 @@ public:
//- Add the thermal source to the enthalpy equation
virtual void addEnergySource
(
- const basicThermo&,
+ const fluidThermo&,
const volScalarField& rho,
fvScalarMatrix& hEqn
) const;
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
index 35d2965a7a3..26991dc40ad 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
@@ -44,7 +44,7 @@ namespace Foam
{
// Forward declaration of classes
-class basicThermo;
+class fluidThermo;
namespace porousMedia
{
@@ -107,7 +107,7 @@ public:
//- Add the thermal source to the enthalpy equation
virtual void addEnergySource
(
- const basicThermo&,
+ const fluidThermo&,
const volScalarField& rho,
fvScalarMatrix& hEqn
) const = 0;
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
index befa29b013c..c636fc9e876 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
@@ -24,7 +24,7 @@ License
\*----------------------------------------------------------------------------*/
#include "thermalPorousZone.H"
-#include "basicThermo.H"
+#include "fluidThermo.H"
#include "volFields.H"
#include "fvMatrices.H"
@@ -46,7 +46,7 @@ Foam::thermalPorousZone::thermalPorousZone
void Foam::thermalPorousZone::addEnergySource
(
- const basicThermo& thermo,
+ const fluidThermo& thermo,
const volScalarField& rho,
fvScalarMatrix& hEqn
) const
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
index 4356f87cdfc..127d7fdf91c 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
@@ -49,7 +49,7 @@ namespace Foam
{
class fvMesh;
-class basicThermo;
+class fluidThermo;
/*---------------------------------------------------------------------------*\
Class thermalPorousZone Declaration
@@ -127,7 +127,7 @@ public:
//- Add the thermal source to the enthalpy equation
void addEnergySource
(
- const basicThermo&,
+ const fluidThermo&,
const volScalarField& rho,
fvScalarMatrix& hEqn
) const;
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C
index 1e0da4b7a6f..8900a7350a2 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C
@@ -48,7 +48,7 @@ Foam::thermalPorousZones::thermalPorousZones
void Foam::thermalPorousZones::addEnergySource
(
- const basicThermo& thermo,
+ const fluidThermo& thermo,
const volScalarField& rho,
fvScalarMatrix& hEqn
) const
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H
index d30a38b2993..d239e0daf07 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H
@@ -95,7 +95,7 @@ public:
//- Add the thermal source to the enthalpy equation
void addEnergySource
(
- const basicThermo&,
+ const fluidThermo&,
const volScalarField& rho,
fvScalarMatrix& hEqn
) const;
diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index 7d3c408e915..2cdf87d5d11 100644
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -60,7 +60,7 @@ DeardorffDiffStress::DeardorffDiffStress
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
index 9e57d10e116..f222e4faaa5 100644
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -104,7 +104,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
);
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
index 0a3abf0fb3a..55c702f8352 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -46,7 +46,7 @@ GenEddyVisc::GenEddyVisc
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
index f11a06da9b4..f124361277e 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -92,7 +92,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
);
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
index 6e76cd2bb0c..f691be02ed0 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
@@ -46,7 +46,7 @@ GenSGSStress::GenSGSStress
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
index 20309c32036..44a4bcd9f41 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
@@ -93,7 +93,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
);
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index 7f7b86d1bb2..0a338e29068 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
@@ -58,7 +58,7 @@ LESModel::LESModel
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName
)
:
@@ -98,7 +98,7 @@ autoPtr<LESModel> LESModel::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName
)
{
@@ -134,7 +134,7 @@ autoPtr<LESModel> LESModel::New
"const volScalarField&, "
"const volVectorField&, "
"const surfaceScalarField&, "
- "const basicThermo&, "
+ "const fluidThermo&, "
"const word&"
")"
) << "Unknown LESModel type "
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
index 32bd44971da..47b25419204 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
@@ -53,7 +53,7 @@ SourceFiles
#include "fvm.H"
#include "fvc.H"
#include "fvMatrices.H"
-#include "basicThermo.H"
+#include "fluidThermo.H"
#include "bound.H"
#include "autoPtr.H"
#include "runTimeSelectionTables.H"
@@ -121,7 +121,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName
),
(rho, U, phi, thermoPhysicalModel, turbulenceModelName)
@@ -137,7 +137,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -150,7 +150,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
index b05630dedc5..576eec1dd9c 100644
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
@@ -68,7 +68,7 @@ Smagorinsky::Smagorinsky
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
index 947b49fa75d..6ba2e6634ca 100644
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
@@ -96,7 +96,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
);
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 5819741e391..9312e91eda6 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -113,7 +113,7 @@ SpalartAllmaras::SpalartAllmaras
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
index 5caa292642e..9d778ff55d0 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -111,7 +111,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
);
diff --git a/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C b/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
index ab1584a29cd..b73ff828692 100644
--- a/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
@@ -105,7 +105,7 @@ homogeneousDynOneEqEddy::homogeneousDynOneEqEddy
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H b/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
index 8464dd8cf77..b002b127126 100644
--- a/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
@@ -109,7 +109,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
);
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
index 0a2b7acf127..9682b62ba74 100644
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
@@ -63,7 +63,7 @@ lowReOneEqEddy::lowReOneEqEddy
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
index 42aca80291b..68abe5b75f9 100644
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
@@ -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
);
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
index 10b069b449b..d6d3b391ac5 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
@@ -59,7 +59,7 @@ oneEqEddy::oneEqEddy
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
index 0b463fb5c99..1220e39a695 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
@@ -104,7 +104,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
);
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index be15b764740..154df3132f0 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -50,7 +50,7 @@ LRR::LRR
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.H b/src/turbulenceModels/compressible/RAS/LRR/LRR.H
index 14237fd20a5..07692ee6c99 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.H
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.H
@@ -119,7 +119,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
);
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index fb9bee6570a..5f852ab5914 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -50,7 +50,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName,
const word& modelName
)
@@ -253,7 +253,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
"LaunderGibsonRSTM::LaunderGibsonRSTM"
"(const volScalarField&, const volVectorField&"
- ", const surfaceScalarField&, basicThermo&)"
+ ", const surfaceScalarField&, fluidThermo&)"
) << "couplingFactor = " << couplingFactor_
<< " is not in range 0 - 1" << nl
<< exit(FatalError);
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 4266e05e5d6..b2d45934a04 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -128,7 +128,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
);
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 0d27e370505..9a2c72b4c95 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -65,7 +65,7 @@ LaunderSharmaKE::LaunderSharmaKE
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 7afa0d232c7..c06cc07f4df 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -112,7 +112,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
);
diff --git a/src/turbulenceModels/compressible/RAS/Make/options b/src/turbulenceModels/compressible/RAS/Make/options
index b1d392c0de8..8b8e57cd179 100644
--- a/src/turbulenceModels/compressible/RAS/Make/options
+++ b/src/turbulenceModels/compressible/RAS/Make/options
@@ -8,6 +8,6 @@ EXE_INC = \
LIB_LIBS = \
-lcompressibleTurbulenceModel \
-lfiniteVolume \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lmeshTools
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index 26878b8bc60..7e09a4b1a86 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -59,7 +59,7 @@ RASModel::RASModel
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName
)
:
@@ -102,7 +102,7 @@ autoPtr<RASModel> RASModel::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName
)
{
@@ -138,7 +138,7 @@ autoPtr<RASModel> RASModel::New
"const volScalarField&, "
"const volVectorField&, "
"const surfaceScalarField&, "
- "basicThermo&, "
+ "fluidThermo&, "
"const word&"
")"
) << "Unknown RASModel type "
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
index 1a24cb78ee5..377515afa79 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
@@ -49,7 +49,7 @@ SourceFiles
#include "fvm.H"
#include "fvc.H"
#include "fvMatrices.H"
-#include "basicThermo.H"
+#include "fluidThermo.H"
#include "IOdictionary.H"
#include "Switch.H"
#include "bound.H"
@@ -130,7 +130,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName
),
(rho, U, phi, thermoPhysicalModel, turbulenceModelName)
@@ -146,7 +146,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -159,7 +159,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 96155d40a43..8302d28df1c 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -49,7 +49,7 @@ RNGkEpsilon::RNGkEpsilon
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
index 477cfba15f2..e9517bd27ce 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -108,7 +108,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
);
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index b76872cfa1f..5a6bf8e8b90 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -116,7 +116,7 @@ SpalartAllmaras::SpalartAllmaras
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index f3b83a11487..15e020fa9df 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -149,7 +149,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
);
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index aa63cf9f239..ee80730baa6 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -49,7 +49,7 @@ kEpsilon::kEpsilon
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
index 62e2f65c387..7c532837776 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
@@ -104,7 +104,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
);
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index e1ffc23d8de..e84be63ad6c 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -92,7 +92,7 @@ kOmegaSST::kOmegaSST
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
index f4798d852d2..6c964ad7202 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
@@ -187,7 +187,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
);
diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
index 39280c2e528..61376d1f819 100644
--- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C
+++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
@@ -47,7 +47,7 @@ laminar::laminar
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
index 09597983ced..7b9ebc0683e 100644
--- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H
+++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
@@ -68,7 +68,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
);
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index bb0f3041fad..6206fda9399 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -94,7 +94,7 @@ realizableKE::realizableKE
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
index 8098dd0ee6c..5f096bd6e99 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
@@ -126,7 +126,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
);
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/options b/src/turbulenceModels/compressible/turbulenceModel/Make/options
index 04ed1110ac8..6aac047cf14 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/Make/options
+++ b/src/turbulenceModels/compressible/turbulenceModel/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
LIB_LIBS = \
-lsolidThermo \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lfiniteVolume \
-lmeshTools \
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index 3579d15b6b8..034cd50e3ed 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -27,7 +27,7 @@ License
#include "volFields.H"
#include "solidThermo.H"
#include "turbulenceModel.H"
-#include "basicThermo.H"
+#include "fluidThermo.H"
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
@@ -40,7 +40,7 @@ namespace Foam
4
>::names[] =
{
- "basicThermo",
+ "fluidThermo",
"solidThermo",
"directionalSolidThermo",
"lookup"
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
index 885d70b94f3..c0abdb8ef9b 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
@@ -31,7 +31,7 @@ Description
kappa:
- 'lookup' : lookup volScalarField (or volSymmTensorField) with name
- - 'basicThermo' : use basicThermo and default compressible::turbulenceModel
+ - 'fluidThermo' : use fluidThermo and default compressible::turbulenceModel
to calculate kappa
- 'solidThermo' : use solidThermo kappa()
- 'directionalSolidThermo' directionalKappa()
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
index 78f40e5a9d3..fd6ab5472aa 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
@@ -36,7 +36,7 @@ Description
type compressible::turbulentHeatFluxTemperature;
heatSource flux; // power [W]; flux [W/m2]
q uniform 10; // heat power or flux
- kappa basicThermo; // calculate kappa=alphaEff*thermo.Cp
+ kappa fluidThermo; // calculate kappa=alphaEff*thermo.Cp
value uniform 300; // initial temperature value
}
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
index ac1217db103..e9fc1f84aed 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -51,7 +51,7 @@ Description
Note: kappa : heat conduction at patch. Gets supplied how to lookup
calculate kappa:
- 'lookup' : lookup volScalarField (or volSymmTensorField) with name
- - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate
+ - 'fluidThermo' : use fluidThermo and compressible::RASmodel to calculate
kappa
- 'solidThermo' : use solidThermo kappa()
- 'directionalSolidThermo' directionalKappa()
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
index 947afc5f7c3..1c9bd5ebf3f 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
@@ -48,7 +48,7 @@ Description
lookup/calculate
kappa:
- 'lookup' : lookup volScalarField (or volSymmTensorField) with name
- - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K
+ - 'fluidThermo' : use fluidThermo and compressible::RASmodel to calculate K
- 'solidThermo' : use solidThermo kappa()
- 'directionalSolidThermo' directionalKappa()
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
index bb538f7b219..7e0d8f81328 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
@@ -51,7 +51,7 @@ laminar::laminar
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName
)
:
@@ -66,7 +66,7 @@ autoPtr<laminar> laminar::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName
)
{
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
index 776ab8bc772..3b7802b6c52 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
@@ -66,7 +66,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -79,7 +79,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
index 111cd2a5369..455ff9a72d1 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
@@ -47,7 +47,7 @@ turbulenceModel::turbulenceModel
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName
)
:
@@ -81,7 +81,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel,
+ const fluidThermo& thermophysicalModel,
const word& turbulenceModelName
)
{
@@ -114,7 +114,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
(
"turbulenceModel::New(const volScalarField&, "
"const volVectorField&, const surfaceScalarField&, "
- "basicThermo&, const word&)"
+ "fluidThermo&, const word&)"
) << "Unknown turbulenceModel type "
<< modelType << nl << nl
<< "Valid turbulenceModel types:" << endl
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
index 790e6e99e44..e6d8bf290fd 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
@@ -48,7 +48,7 @@ SourceFiles
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
#include "fvMatricesFwd.H"
-#include "basicThermo.H"
+#include "fluidThermo.H"
#include "nearWallDist.H"
#include "autoPtr.H"
#include "runTimeSelectionTables.H"
@@ -84,7 +84,7 @@ protected:
const volVectorField& U_;
const surfaceScalarField& phi_;
- const basicThermo& thermophysicalModel_;
+ const fluidThermo& thermophysicalModel_;
//- Near wall distance boundary field
nearWallDist y_;
@@ -118,7 +118,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName
),
(rho, U, phi, thermoPhysicalModel, turbulenceModelName)
@@ -133,7 +133,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName = typeName
);
@@ -146,7 +146,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel,
+ const fluidThermo& thermoPhysicalModel,
const word& turbulenceModelName = typeName
);
@@ -177,7 +177,7 @@ public:
}
//- Access function to thermophysical model
- const basicThermo& thermo() const
+ const fluidThermo& thermo() const
{
return thermophysicalModel_;
}
diff --git a/src/turbulenceModels/derivedFvPatchFields/Make/options b/src/turbulenceModels/derivedFvPatchFields/Make/options
index 7e9faff242b..66712d18ee2 100644
--- a/src/turbulenceModels/derivedFvPatchFields/Make/options
+++ b/src/turbulenceModels/derivedFvPatchFields/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
- -lbasicThermophysicalModels \
+ -lfluidThermophysicalModels \
-lspecie \
-lmeshTools \
-lcompressibleTurbulenceModel \
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
index 5e07713cdcc..02752e8e3dd 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
@@ -50,7 +50,7 @@ boundaryField
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa basicThermo;
+ kappa fluidThermo;
QrNbr none;
Qr Qr;
kappaName none;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
index e4532b2ea3a..97cc072e8b4 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
@@ -95,7 +95,7 @@ dictionaryReplacement
// Coupled BC.
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
kappaName none;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index a736e341f62..df398884781 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -57,7 +57,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
kappaName none;
value uniform 300;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 787c1147d8f..c1a4e6bf169 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -68,7 +68,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
kappaName none;
value uniform 300;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict
index 4c53b4cb8aa..1a7f5ecdd54 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict
@@ -70,7 +70,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
kappaName none;
value uniform 300;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save
index 35bf28b9020..797ef03aa28 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save
@@ -57,7 +57,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
kappaName none;
value uniform 300;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict
index e4f2256b3cc..18b85ea2e9e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict
@@ -69,7 +69,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
kappaName none;
value uniform 300;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index a13bf045016..7abf71ca467 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -57,7 +57,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
kappaName none;
value uniform 300;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
index 787c1147d8f..c1a4e6bf169 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -68,7 +68,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
kappaName none;
value uniform 300;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index a736e341f62..df398884781 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -57,7 +57,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
kappaName none;
value uniform 300;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 787c1147d8f..c1a4e6bf169 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -68,7 +68,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- kappa basicThermo;
+ kappa fluidThermo;
kappaName none;
value uniform 300;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
index fb0130ea256..c9197f1b246 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@@ -55,7 +55,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa basicThermo;
+ kappa fluidThermo;
QrNbr none;
Qr Qr;
kappaName none;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
index 369915887ec..704d77ce700 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@@ -66,7 +66,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa basicThermo;
+ kappa fluidThermo;
QrNbr none;
Qr Qr;
kappaName none;
--
GitLab