diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index b9937a8a698bc9451afe8e721e00be58cb3f6170..135659c2766cb7ec98124f7969e95a8fad1d6f48 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 1e08ae11975328093f0987a89a7dcf1e0ec03e6f..53ae252b9b4718fe3fffc338a831066cd8349e11 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 68387c934a93dc871db4543adcf0e1ae91773a06..da5809d3b0ba3f6861cbade4ea47773725e4b751 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 66dae7fcb34ded2b6df3a287657d2132917b3865..0812df5e3bf3bb3979d1bde18c97acb35b91583d 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 d5a7a75202f6542ae39a84fb27fa6eee406318b4..7b95c2f16f7a1edd45273879385e064d33ebe805 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 dfd9248ded0419b53563798ce68372c9b42fb928..5af1f2fd617c31bd3da68a85f86d39f3a9f9597d 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 cf5fa5febe38f3057fef233376bf24e30796286a..ff38fdf05192bcfac7d2133718dadd6fdd3cb721 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 c75e2acbdb7e6465870c1537841c2b80a2d8f3ef..861bde659c1909dc799402c71c154400d023161f 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 8eb6d4cabdac7d75a037f5f639685739bdb30b45..46b69a63cd523c4af2fd12d5f78a228fe64c8b96 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 5a5df2ed7b6f552e4d6a281f8b0de7cff35470fc..8d18c08338865091658fd810ae0ebb66269ba966 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 999e0466cdcb59be93b6fbeda75dc6cd431e74b1..6870682cf27f31edbe4ecc4b32c3db40e7afc701 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 b3be16a505ba404ffae656a60cf07afc128b55c6..4ddaa7fb9714e9ec0106886343b52157ef7fcb36 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 250effbee28f0d9ffbe9f1abe7d75f4ea7dd8be3..33707728f697baebd4fbc5b604e0cea1b6592549 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 47a62ae92a03b39d2fa5a6b0e9e835913c806fc0..f21e7394e4db3c8d5cf3770ecebbe46e30e4ec50 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 d16a0ee1d88a2d9a037f976e6f5b9bc7c7074261..6d3c41f0dfa6bde2b2e91e36a9458c172ca6cf13 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 dcf5a81490fdfecb93c5c995b24bf6b82e0ad9ce..5c83c910d95a4aa6b5de30075e4f764309a4bec3 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 4067875fbc6f02fa0ca80cc96e289e6d8e33a894..f01ebda533b3a30f359683e4b72fde503798f830 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 700a6a67535022ddcaa5f28f4d9eb721b3d30ba3..339cc53bd9e9e2e045b859cec7a26b8076168565 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 14e73bf2a5c70655050bcbf6bdb1a45f326d8365..2d328b3ed1f86ecd981c6c3fa3bc0225bd67aa4a 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 30c1e55d3102e2ff68a095ea497bc3481bc79735..8a8553525f39f3e90f00669cec5ee8eb4633f149 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 a5b9436ac6e288f4f31f7ae6fdf29c7272af5357..f9c097c87482261e6fb2b54448d52c6e540f18b0 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 73e3e02dc4acbb2d18afafaa48863c59d5e2f3e3..263b9861edb4f2a86bc3908ab378ee0ea974dddb 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 8d01214e6cf4ab096cb34b4ee3d4cc4694420798..db07a71c8601ca497a8dc9e7badfc4026aaf2cd5 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 c8a3b02a0fab2ece7d783785b0805e92e1d1f15d..74ddd1244659aa9f6591ddb2ea9f9b2d46881429 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 96c99816d0fc80bff0e7e70ab5f9c86c02c6fd32..f2ebc095ffc09ece9eca7b3713ef4ecbdc3dd407 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 f2b077aa821d1900a6b253ab5cf01ced72bd89bd..f5520125f788c39bf4c6c0e507f20f8cf14d27ca 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 2f1ae559fcc1e5106bae18cedf53ec16bcebab30..d5c1e47394af7f6b76f040c6455916a661561d92 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 bfe0fa7d39c30b9e590b7a10baaa62bf145fdb39..f87b446266f02f8b9ba8d53d12bf9f2c265ba097 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 e008a3e3f5324af694fffbce651a134b6b835baa..adc629c4f2b168e56c74193bd05ba17571106af8 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 7b9dff602e77a2ba68d4103f9682a84ee199549e..9cdd2b7295d70a8d74d87c9bd5b047abdff753f7 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 5dcfe1df4fa11c97439b34517bb6edf4ebae649e..87c882c9a6a34a67136fe5c844e1c175830ea23a 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 f7bb7d2f2d26c5dc2efb6d8830df8f885d317a5e..4535f635dcd0452e4d818ac938680a29f257013b 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 9986f9f78bcb87ddd54524d5b021e62aca5335a0..cb0f90524a56003c87aa192cba3889fca575eac3 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 7fc77306fd426213ac3ea3b25dd259c066a12226..1f776f0412568d449857c043483bdda8c4c44ceb 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 5a1c428566a1ab527773aaf7e470f1f3dac77746..a477abff475c373cff3e7d55f71c69d7706bb88e 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 ba327a029fc365b016c2493853f6cd9115ad1a14..6438a34c2997c626961cc2568d1a8a83d7dc33fe 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 647a53c1b4ec619834a8a677e68b14004d2c3705..0d5e4b6dd4863150beb6a15dc2a71bffc72963a6 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 f32b47478d1ea2e0d006a8e76061ccc41b29a3f8..d9ae7414b2b989af4a323faaafae2b47e75a8885 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 d302015a3140a22865e1becbadc725afd5ed5b05..12c7c1c551124077ff728b972778e9c0a303b38c 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 2991254cdb6669833e09e9836b5a03d9b71f27cc..43615129c977cb6ec4a36ca752ce2482f593b556 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 66477ecd8e6c9da88671e00c507f1d4bc2a107ca..e42252ff31c8d5368759d02839d0bbf777eadda7 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 6531073136cec0d02abf3898e681223370e16637..b133509318af20c296c833c54ab8138119d5272b 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 3463175d7725ab445f191ed7c0d736a8215dd4fa..45e286d247f2e280c9b891e97cab4275864b8e78 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 c9733e397ac5cf34d0d6a73af6cb619871ebc47d..d9cb09bedf3a3b2031d2de716afbbce7d8d0ab35 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 4e4ea81b3d87463b4c8d91fb115e0ea465e4b41b..7125bd33af9ef110e89ee26c312a8b6f0f045324 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 7675f43a75295d0d10acabe3785738463c814282..29d9b4d8c303aacfa11a0947d384d103d21923e4 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 c262482ce734e742ab063b8ac4b3463c832934b8..959eaad312d004a946c917b88c31e9ebe8c01051 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 a06024973aa9b401311987ad5d633a8e10b61471..7af7981bccd896ea9e33cc30cce6eeae7d38c203 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 36579d56ccf31f0b9c103cd1b43fe149fd78e3d4..38f94e13c796f0fae889766f19f1f3eb809a1b3c 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 3a665ec2743bd9f3a7768f3f92bd05e19e03168b..da7585b83175febac3f111af927b95a21266040e 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 b386fa4540210e189a3c8887c3f08ae89f9d2f49..240bf953ba50f36955bf829a38a84d2bf8408f6e 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 83a1e57f42dccc7b522af52ac22430dd3be18830..ce89695567e0e583071bdd9d934adce5e5d88817 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 55e668ee86e711cc6285fe687a0f8c83570dad79..27b70cae0a7d3fd5c02368e001ad81a0c135c2dc 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 5b0c4b4957f524850a499ac24c2cd1c1c21cfd15..2f8b1503418c5b08bfb13033618f93960e3a0e12 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 7a1f8e278d5aa4904d5c6d21476c08fef1844866..60692ce6739d543330594fac6880c1dd8a686000 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 7fe5ba4077fe6c57b2daafcc873b929c962665a2..3a2cb8bce469c39b39747a764b4bdb8622a8b962 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 5550a0961a4c493e7a11431a44747a6a23fa703b..04ec43aca08ea3643ef9424cd51c4ba19711fa11 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 3135f89124baa16e325371c253841c6affa2ebf9..1cd4178faf342efd4aa6af9ee46e0642fc989fc5 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 030e91ea3906a9f794f557460a3f03322a5806a0..1c4c78a5eb501d6ba6b05b1ae35f98a9dde0596a 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 2b9ab5fb778b648c99968a8e4215d42232f0c1e0..34a2babd735d8e8a6b2e69c447755c3660058595 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 9165621d6c9826698e074934e1a5831f6055c35b..ae4c1f9d66075f32b3590f0feebcd52a15b09ef5 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 b5ccca4ed27866215b182f6806698db3c39222ea..63909004cd9e2e81357e93025552edfea8f9bacf 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 e775c173b752b36e491660199469c67b894d26f5..f4e774028ee458a334ce664a39deecb2ca0aff55 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 7d05012b852a10584f038881722de9c40ad4a4a6..ff99635cfc66b793d6399cbe29085f430a1fbca2 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 2c2249da024b1aecb0272fe8d9341f29d7662c9d..5d6997be822c575ad65bb90f7779139df01fa6e9 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 bff4d221e2b7fb22b3cd44c2c76ff600bf2f52f9..ba8dcfe66c1c999bf5ce450885e6f4c39b09ba59 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 59286ec15705d1cad8058a8fd8ca4ad215163875..042469f8a99636a3afdb2e19677700f00c3e3db9 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 2b9ab5fb778b648c99968a8e4215d42232f0c1e0..34a2babd735d8e8a6b2e69c447755c3660058595 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 72bbb01e6b440f263d6e8fd5811ff805cf793fa6..afc10fb1aad15a165291f66c0861d7362061da13 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 ff9ba3a4e3e749c46189eb80334f68df95f95d53..cf835d66ef607f78889ed8e01a97783bd069e1a5 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 9acdda40ef3fdbd183628ef0ab4f6acc8a9754d8..61713e09134be2aac6a3f6db5eeb15df2d08953b 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 3ce28824341c99a5e6a61bac0228cef4ab1044f2..6f12d7c8eee897ccab1b0367986930e6cc3e1b08 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 6543081f228e78b4a467a3a30252bee3cb985cc7..fc580a43f8046c72a05843029279afc60bc7e6f3 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 44b4d4fcd1f2131d3c123e7f74edd1c90067e566..386680807e276dfcaac612f1b806a14e8649f939 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 c6b9647ff776516893fb4c6c65676c706703575a..d041b7ab9d29e4435fa3b6b68cc78c7fe2c55e7d 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 2460ee5821cec46f2d9dd38b209ec92b9ac33cd8..c780fd3119fd15d79e80fa212a30068b0cc3131c 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 688351b4ffa48e3cd700d26346349635e17e4b12..f49b474762a378a019eb3adf8d5190b43dd260a4 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 73fb45fc3d3a9bae4b4957e7f2a0059338993d3d..4c2a383e63dfce1b305e86b87931b05a510a89cb 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 e1ebf3c33cec975337d7657bb10671e307a6ebdd..9bdb96e2e3d5872572786d61128667a6612e08bd 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 aa44725f543c2bf66f934bba108f83bcdc07735c..0000000000000000000000000000000000000000
--- 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 cc06c754475369139880c3d0f4bc01ff6f9d4464..0000000000000000000000000000000000000000
--- 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 894ab3d8fada58ea469b9983485826abf0920273..d3ba1becdd81d87b5a91dc65f28a29fdd56fd2d4 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 8584ddf4d1653fd97c6cd18f323f44c258019c88..3dd72e1e68579b520bd25636d71adcdeae4a6757 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 9398af885b7bc24d6a46e6706446a5d76bd9f2f2..42ed096ea60e297e05d85600c12843d4ebf7eeca 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 4ee126e24ae03c7292f4a52341f515fb1a5cb9b7..af83cfd20e9c4053fe1fedf102a96a5d84be6f7a 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 d0f8315b2e0610d179501177d3c17f52e736da2f..681f1c36a1975bcfc125431dd084d26794d3ec50 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 0000000000000000000000000000000000000000..e62ae73c6592af6ebb87ebd46e00416728298348
--- /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 0000000000000000000000000000000000000000..b7c964fc005d885ab6a9453ef9bd46cc6d3ff54b
--- /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 64e2fd481da4f55fdbf4bcfb60259e13a5abace2..d6977a542a063e3401c51555ee1497e725ef2da8 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 06a65304c25fed91d8344eadfed20637b16614ee..41ab0bdf667e6086c72db9eb01027554914e1b77 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 fa2f90fe304a74a6755e4f482ace28766e54bd9e..134103106e6434e53e9f0d01db23183e1b401923 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 7f2bcde6c7bcb47027082689707fca7e35368b24..990341965d7df9766208de4c9b297589ca0ac9ac 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 419eab0708ccbc44358f8d63e0fde66233f88263..a43347cb9137afba6240c78df241ed458a830c5c 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 2a32ea049ab11615c76a9841258840290fff2c31..9cb27bd4b8d4d3c84cf5a21326d73ba32268edef 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 3cdfbc22ac450a66d647c677a8730c6c1f8ff1f7..b8f70e8dfac58e4670341a222c7b4ddb072af871 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 322cd01591561760c8abd9de4057413b952f5276..248131e32edcd1cbc21301008260ee47c0720e05 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 cba6035e8fd4c91cf1777edbbd3364897652a14f..1664d8edd17f80af106fd2c27850be2ca0fa0698 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 9b02340acf0bea4df20a36868472f08840856e6a..b9963f0f70a88e6819ebdb824ec6fef6e5bba4f5 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 d1a924ad11e0aea8585b03ad672f793fb4808b0c..c6c724ad78b696c93c345c227e9a353b2fc727a4 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 32a20fe0a8f3d9b68469c7dcc531d583bb277538..cf016b79221843abc7d75b27a1460743ad79764e 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 dcaf7f01f60953fc0cae13736c5ef8cd88870cc3..e0926fb8d1d70fd3474b67b2909d16287828822c 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 ae32678cc7ce8b663b94cdf86329e716bbf433c6..e28564adbf64bbbd5b0b82995e128127b66ec814 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 8dfd16b70535c711006e890abb70360c22c928ee..356a2ba06edb905df31d80de6e20e2125c6d89c7 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 3173bd5c3084e1a8f765e6877b52013e82b7c356..6ff422db118ff538a9252bb0ed0cf014009a08a0 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 fb8c15620e35fe66b5355a613f42cae5c78fd7f4..e5bb9fa2741cdbc284ee07a0ce65bb548e98417a 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 398debb7260338a04194488e8e27b1af37ef3ab0..62fbbeba7e8dd848a5c1f72e0aae5b33dda5000d 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 ca2d6183be35fd2d39863ff61a2c74c01666ee4c..d407126e2aaadef234647e652dbf55b369a7aab4 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 47cfe67dcd489b6e6dfe4177b3cd45b77ae840ed..b7fee8652025cc4cac109f79df3d00eab8b44311 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 b8932dd2e496ee08dab06d01b760edd915e390d8..f28317a9d452e45180d97d06b643c427ee2f268d 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 7a5a1be53e3594ddf7ad00e333a35f6dcc0833a0..4beef65f4fa410238ef9df44db0f27eeed6a4753 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 bad8b4dae011c969b7a4aa29c2d56f8344b0f709..1b9c1d8b83242a182b99fac406642d38c24f43fe 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 35d2965a7a3120a952645f2b816aabdfffc3922c..26991dc40ad1d09be827c0da80e6c5df295f7b6b 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 befa29b013c5daf7ef22884483ef0abcded23b5a..c636fc9e8760aa93f41d9bed946d59f4a7a090cd 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 4356f87cdfc8bb29ab69261b950f278fe4c811a2..127d7fdf91cb4056b522fd2798bca836d7b1e472 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 1e0da4b7a6f3b70418c2f4e5f4f6b74fc37000a5..8900a7350a2e1417b0eea6f9b7efffdfa1604709 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 d30a38b29937ca5b6f6517cdf0aa3d56442ff74e..d239e0daf07c96d5fafe3ce420812d5269ee2aeb 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 7d3c408e915be808f4acbbb3d1a72aa79c33c199..2cdf87d5d117880aeec63d3f14a1459da6602c6e 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 9e57d10e1168949178547f1e673d858190e3abb6..f222e4faaa5a09ffa2777db8acb392c84f5cb51b 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 0a3abf0fb3a546fcbf358fed0f8dd3ce21cec54c..55c702f835294f3ecf5d73f5d9842e1968be94a1 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 f11a06da9b47dae8fbb29a4c030302fc07a90af3..f124361277ead97dbd746ce345a239b5259f4ee4 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 6e76cd2bb0c1aa9c623956bc3c1e8180d21b911b..f691be02ed0aa299a8c5edbe2279796ca68f8bdf 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 20309c32036db18c0644d683994a4d2274d9b4ed..44a4bcd9f41c66469d662968f053acc164c8207c 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 7f7b86d1bb25b76a33313231d5841e38f7dfd28c..0a338e29068848fdbeb30263ed5f5dc7bdb536cb 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 32bd44971da481a464a3d5fce4c6e6bdd5575c90..47b25419204b167cbad12eb116ddaad92d209410 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 b05630dedc5b02e640fb8205902fe04175b6ba7d..576eec1dd9c5b7da4c576a9b0c972462a13002f0 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 947b49fa75ded3eb25f14d759ab4a175c937eab4..6ba2e6634caaa56b727686249f447a46fdb58a8a 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 5819741e391e94c62dd936b3517c250d533837f4..9312e91eda6216da457f576374cf1af15b9a5609 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 5caa292642e91ba3cd6a0e9409ee10605af254c3..9d778ff55d09c4c25739af25106a71c7fa21d318 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 ab1584a29cd3ccbcadd0947a3d469107a4304f75..b73ff82869254af660e0e936d632f8d855266fef 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 8464dd8cf77d67f60769cd7735ecf4d0532bb4fb..b002b12712608b51691dd058cf34f9cba08d76fb 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 0a2b7acf12760c880b456846de6964bc04ac72ae..9682b62ba74f18a71ecee07d6e499871b2eb8bd0 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 42aca80291b0de45645b2cbf7568e3af6138fb32..68abe5b75f9f9b72c5b9b42be94b1e00567042b4 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 10b069b449bd6cfc531abc263271b0b93ae2ba1e..d6d3b391ac5dfe769cd9d364629e97891e3bb519 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 0b463fb5c997439ebc7bc3ea51088ee34c050863..1220e39a69526b51952c89908fd17d83455585da 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 be15b76474057a28df10d241e05774a33cf253e4..154df3132f03d42b0fb63ea5356bdae86638ca4f 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 14237fd20a5581b63c8e38daaca5e5b855c7083d..07692ee6c9926d156a77ce34216ce42fcd10ccd9 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 fb9bee6570acf4836bc5af7b63afdedb6de55b6e..5f852ab59149da9f267325fe59eabccd33f879cd 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 4266e05e5d6a5502dda15650b251a09a924c4cb2..b2d45934a04bbafca660653b6a29fcb966413875 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 0d27e370505b0022588b729711b0f1c88062e76f..9a2c72b4c95b00dda89d88f3548af9c3d2b3cd5e 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 7afa0d232c79f26d8f3f70240456f95fcd34553f..c06cc07f4df8300288b0821ec714bd73e7eb7706 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 b1d392c0de85e5a4264ebbcba37cde06317bc8aa..8b8e57cd17927311b940a24407541a31a17eb6c0 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 26878b8bc603ef32fba13d1b0f34a3fb0ea29357..7e09a4b1a864ee70f204ceb69b9b68b0002fdb4a 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 1a24cb78ee5e257b6d3e318d76733519feee806f..377515afa7982d1500cb000d5fd4ae55b3d6731a 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 96155d40a43be6bec13e6fd6d03a2bda814bcb52..8302d28df1c27ef1c64f122e81da10b81a91fc32 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 477cfba15f2679fa25447f3f1602836db628bc7e..e9517bd27ce1164ab0e747fd7f6deaaa9d7b90a1 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 b76872cfa1fa4e8fca8504ff1baf5bf3eee84bd9..5a6bf8e8b90ee168c7a30cc81df4c2a77cc85a30 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 f3b83a114873c1b6586e641c24d608103d219d84..15e020fa9dfc5f2108f878d6e1c4b03f951e6a9a 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 aa63cf9f239b94c5e49c03fff93d849f103ec376..ee80730baa6c7092aa99dfaf538df270f3c8a837 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 62e2f65c38768b5a732c8013f49c13563a73eac3..7c53283777624cf127537a808b6cb0704ab12b8d 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 e1ffc23d8de99001a85a26025dcbbd982a7d5c17..e84be63ad6cd86e5ef1de6f37c36d77d4c778b37 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 f4798d852d2e0e7054772508187617a6d4d6a92b..6c964ad72025b6f3e4681356cf721351a149f333 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 39280c2e528675b8cf0e3610b6608949db36a51e..61376d1f81957fad94ff4460d75e67f394536392 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 09597983ced96aedd63dcf9d7f14ce372c2c7681..7b9ebc0683ed38b789e60411fbd964c014be71f8 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 bb0f3041fad76fc7f01289a8a540a7c45e5a5b34..6206fda9399a8a458512ef9fff00b4eb621a7d44 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 8098dd0ee6ce980f2790bbf387079e421049dd46..5f096bd6e99cd2820e630ccbd0d6a45c21e8eb2e 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 04ed1110ac8cfe838a8b0b758f765c14a45d7856..6aac047cf1480ea1c1a19dcab9c6ec13318506e7 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 3579d15b6b8281ec2f85ef53e76afe4dfc5bca30..034cd50e3edb04b7c4ee0c6f3d696a19a98ee24c 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 885d70b94f3d2f9e25f35042a226443231056123..c0abdb8ef9b1e1992292d9a8b09f5d97bbab3b64 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 78f40e5a9d33653d95b86de4e518a515a6e4fbf3..fd6ab5472aa405a390cc14e7a380027852d836b8 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 ac1217db103df1c11be3aa719dfdbefed31965f4..e9fc1f84aedd597d9414bcd5d40cecd4a30c164c 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 947afc5f7c328bd50342ccc2f4aaaccc8521577c..1c9bd5ebf3f1f5b032f8834605537261c5660eba 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 bb538f7b219fc602388eb5862f85931b2e9b55f4..7e0d8f81328b87abfe8370a538831fadd7be1470 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 776ab8bc772b7fe0728b23e8e037ff9e4da5b893..3b7802b6c522612754851b72d8a3daa9528f5e71 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 111cd2a5369ecd549fc181da603926b2f02aeeb6..455ff9a72d1b7ac39f36c88fe7e1caa391040947 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 790e6e99e44a02a7669c2a9050e2c89f1478b50d..e6d8bf290fdfbef40eccb24596df3f01596761ef 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 7e9faff242b4df03771305a74ebf50972a9c85d3..66712d18ee2e6e3ee8805877897696f2aa6e8f1f 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 5e07713cdcc87ef01fe2416f7c234fdcb28d80e7..02752e8e3dd247b3f4f09c732a5deb9db986820e 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 e4532b2ea3ac59b574971ff2cce63d5bca93a7f8..97cc072e8b447352369cba0ed8e449c5ba39ad64 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 a736e341f62764e7fea3cc6d0769b3457dbd409e..df3988847815c66cdee90c06c2a47ee5b5f4272e 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 787c1147d8fe51b83896187f272d052e6795caab..c1a4e6bf16904cbea90ad006193bbbac231a07d0 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 4c53b4cb8aa05d21efe07a798b2cf9a78f5b6406..1a7f5ecdd54c364ca6f18c8657be819c6485d5de 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 35bf28b902080f15e0bf42baa1fee727e1ecc10b..797ef03aa283f1f94ce3c2b2a68c293d0e64de03 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 e4f2256b3cc71febc6b2971ee4b513191910fe74..18b85ea2e9ec25e3ba690c48c50a105db78370cb 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 a13bf04501645ae3ab5e7c544e0d2ee46da5b612..7abf71ca46718d2f4c250543ffa8ad993c4e918e 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 787c1147d8fe51b83896187f272d052e6795caab..c1a4e6bf16904cbea90ad006193bbbac231a07d0 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 a736e341f62764e7fea3cc6d0769b3457dbd409e..df3988847815c66cdee90c06c2a47ee5b5f4272e 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 787c1147d8fe51b83896187f272d052e6795caab..c1a4e6bf16904cbea90ad006193bbbac231a07d0 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 fb0130ea256d9b813708b8bd244b681bd10818af..c9197f1b246665ed83b4152d21e81e6438ca9252 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 369915887eca8e731698b99192f6c5856f862761..704d77ce7005ba08e0141c1bc5610b03ff359588 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;