From 9a80d0d5ef5c7362a5f199aa4a50ddc3fccca30a Mon Sep 17 00:00:00 2001
From: sergio <s.ferraris@opencfd.co.uk>
Date: Tue, 14 Jun 2022 13:42:00 +0100
Subject: [PATCH] ENH: thermoTools: new library for thermophysics tools
thermoTools is a relocation of various existing tools:
- src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/
- src/semiPermeableBaffle/derivedFvPatchFields/
- src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/
ENH: Allwmake: reordering various compilation steps
Co-authored-by: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
---
.../solvers/combustion/PDRFoam/Make/options | 1 +
.../solvers/combustion/XiFoam/Make/options | 1 +
.../combustion/XiFoam/XiDyMFoam/Make/options | 1 +
.../XiFoam/XiEngineFoam/Make/options | 1 +
.../combustion/coldEngineFoam/Make/options | 1 +
.../solvers/combustion/fireFoam/Make/options | 1 +
.../combustion/reactingFoam/Make/options | 1 +
.../rhoReactingBuoyantFoam/Make/options | 1 +
.../reactingFoam/rhoReactingFoam/Make/options | 1 +
.../compressible/rhoCentralFoam/Make/options | 1 +
.../rhoPimpleAdiabaticFoam/Make/options | 5 ++--
.../compressible/rhoPimpleFoam/Make/options | 1 +
.../overRhoPimpleDyMFoam/Make/options | 1 +
.../compressible/rhoSimpleFoam/Make/options | 1 +
.../overRhoSimpleFoam/Make/options | 1 +
.../rhoPorousSimpleFoam/Make/options | 3 +-
.../compressible/sonicFoam/Make/options | 3 +-
.../sonicFoam/sonicDyMFoam/Make/options | 1 +
.../buoyantPimpleFoam/Make/options | 1 +
.../overBuoyantPimpleDyMFoam/Make/options | 1 +
.../buoyantSimpleFoam/Make/options | 1 +
.../chtMultiRegionFoam/Make/options | 1 +
.../chtMultiRegionSimpleFoam/Make/options | 1 +
.../heatTransfer/solidFoam/Make/options | 3 +-
.../heatTransfer/thermoFoam/Make/options | 3 +-
.../lagrangian/coalChemistryFoam/Make/options | 1 +
.../reactingParcelFoam/Make/options | 1 +
.../Make/options | 1 +
.../simpleReactingParcelFoam/Make/options | 1 +
.../simpleCoalParcelFoam/Make/options | 1 +
.../solvers/lagrangian/sprayFoam/Make/options | 1 +
.../sprayFoam/engineFoam/Make/options | 1 +
.../sprayFoam/simpleSprayFoam/Make/options | 1 +
.../sprayFoam/sprayDyMFoam/Make/options | 1 +
.../uncoupledKinematicParcelFoam/Make/options | 1 +
.../Make/options | 1 +
.../Make/options | 3 +-
.../compressibleInterFoam/Make/options | 1 +
.../Make/options | 1 +
.../compressibleInterDyMFoam/Make/options | 1 +
.../compressibleInterFilmFoam/Make/options | 1 +
.../compressibleInterIsoFoam/Make/options | 1 +
.../overCompressibleInterDyMFoam/Make/options | 1 +
.../Make/options | 3 +-
.../multiphase/driftFluxFoam/Make/options | 3 +-
.../Make/options | 1 +
.../reactingTwoPhaseEulerFoam/Make/options | 3 +-
.../multiphase/twoPhaseEulerFoam/Make/options | 1 +
.../mesh/advanced/PDRMesh/Make/options | 1 +
.../miscellaneous/foamHelp/Make/options | 1 +
.../foamHelp/helpTypes/Make/options | 1 +
.../postProcessing/postProcess/Make/options | 1 +
.../applyBoundaryLayer/Make/options | 1 +
.../setTurbulenceFields/Make/options | 1 +
src/Allwmake | 29 ++++++++++--------
src/TurbulenceModels/compressible/Make/files | 19 ------------
src/faOptions/Make/options | 4 ++-
src/functionObjects/Allwmake | 1 -
src/phaseSystemModels/Allwmake | 2 +-
src/regionModels/regionCoupling/Make/options | 4 ++-
.../thermalBaffleModels/Make/options | 2 ++
src/semiPermeableBaffle/Make/files | 4 ---
src/semiPermeableBaffle/Make/options | 17 -----------
src/thermoTools/Make/files | 24 +++++++++++++++
src/thermoTools/Make/options | 30 +++++++++++++++++++
...convectiveHeatTransferFvPatchScalarField.C | 0
...convectiveHeatTransferFvPatchScalarField.H | 0
...allHeatFluxTemperatureFvPatchScalarField.C | 0
...allHeatFluxTemperatureFvPatchScalarField.H | 0
...fixedIncidentRadiationFvPatchScalarField.C | 0
...fixedIncidentRadiationFvPatchScalarField.H | 0
...emperatureCoupledMixedFvPatchScalarField.C | 0
...emperatureCoupledMixedFvPatchScalarField.H | 0
...pedMassWallTemperatureFvPatchScalarField.C | 0
...pedMassWallTemperatureFvPatchScalarField.H | 0
...tletMachNumberPressureFvPatchScalarField.C | 0
...tletMachNumberPressureFvPatchScalarField.H | 0
...ppedUniformInletHeatAdditionFvPatchField.C | 0
...ppedUniformInletHeatAdditionFvPatchField.H | 0
...ableBaffleMassFractionFvPatchScalarField.C | 0
...ableBaffleMassFractionFvPatchScalarField.H | 0
...ermeableBaffleVelocityFvPatchVectorField.C | 0
...ermeableBaffleVelocityFvPatchVectorField.H | 0
.../temperatureCoupledBase.C | 10 +++++--
.../temperatureCoupledBase.H | 0
.../thermalBaffle1DFvPatchScalarField.C | 0
.../thermalBaffle1DFvPatchScalarField.H | 0
.../thermalBaffle1DFvPatchScalarFields.C | 0
.../thermalBaffle1DFvPatchScalarFields.H | 0
...RateAdvectiveDiffusiveFvPatchScalarField.C | 0
...RateAdvectiveDiffusiveFvPatchScalarField.H | 0
.../turbulenceBoundaryConditionsDoc.H | 0
...tureCoupledBaffleMixedFvPatchScalarField.C | 0
...tureCoupledBaffleMixedFvPatchScalarField.H | 0
...eratureRadCoupledMixedFvPatchScalarField.C | 0
...eratureRadCoupledMixedFvPatchScalarField.H | 0
...ayatillekeWallFunctionFvPatchScalarField.C | 0
...ayatillekeWallFunctionFvPatchScalarField.H | 0
.../alphatWallFunctionFvPatchScalarField.C | 0
.../alphatWallFunctionFvPatchScalarField.H | 0
.../wallHeatTransferFvPatchScalarField.C | 0
.../wallHeatTransferFvPatchScalarField.H | 0
.../liquidProperties/Make/files | 4 ---
.../liquidProperties/Make/options | 11 -------
.../windshieldCondensation/system/controlDict | 2 --
105 files changed, 150 insertions(+), 87 deletions(-)
delete mode 100644 src/semiPermeableBaffle/Make/files
delete mode 100644 src/semiPermeableBaffle/Make/options
create mode 100644 src/thermoTools/Make/files
create mode 100644 src/thermoTools/Make/options
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H (100%)
rename src/{thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties => thermoTools/derivedFvPatchFields}/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C (100%)
rename src/{thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties => thermoTools/derivedFvPatchFields}/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H (100%)
rename src/{semiPermeableBaffle/derivedFvPatchFields => thermoTools/derivedFvPatchFields/semiPermeableBaffle}/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C (100%)
rename src/{semiPermeableBaffle/derivedFvPatchFields => thermoTools/derivedFvPatchFields/semiPermeableBaffle}/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H (100%)
rename src/{semiPermeableBaffle/derivedFvPatchFields => thermoTools/derivedFvPatchFields/semiPermeableBaffle}/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C (100%)
rename src/{semiPermeableBaffle/derivedFvPatchFields => thermoTools/derivedFvPatchFields/semiPermeableBaffle}/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C (97%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C (100%)
rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H (100%)
delete mode 100644 src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/files
delete mode 100644 src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options
diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index def8d609c2a..ad544559cbd 100644
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@@ -25,6 +25,7 @@ EXE_LIBS = \
-lengine \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options
index 056ed943884..9fa188d81e8 100644
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@@ -19,6 +19,7 @@ EXE_LIBS = \
-lengine \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
index 1e090ba60d1..bbd7cf10666 100644
--- a/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
@@ -26,6 +26,7 @@ EXE_LIBS = \
-lengine \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options
index c44d3f5dd14..1ca21e64734 100644
--- a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options
@@ -20,6 +20,7 @@ EXE_LIBS = \
-lengine \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options
index 9493f785084..c79b6e493d4 100644
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@@ -20,6 +20,7 @@ EXE_LIBS = \
-lengine \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie
diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index bdf679ccde3..4854f5d34af 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -34,6 +34,7 @@ EXE_LIBS = \
-lsampling \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options
index 6363f6d80d7..754c3984103 100644
--- a/applications/solvers/combustion/reactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/Make/options
@@ -19,6 +19,7 @@ EXE_LIBS = \
-lsampling \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lreactionThermophysicalModels \
-lspecie \
-lcompressibleTransportModels \
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
index ad06afa0c06..0c0c8e3ea67 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
@@ -20,6 +20,7 @@ EXE_LIBS = \
-lsampling \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lreactionThermophysicalModels \
-lspecie \
-lcompressibleTransportModels \
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
index ad06afa0c06..0c0c8e3ea67 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
@@ -20,6 +20,7 @@ EXE_LIBS = \
-lsampling \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lreactionThermophysicalModels \
-lspecie \
-lcompressibleTransportModels \
diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options
index 2b1b8035dc0..cb4f2336c65 100644
--- a/applications/solvers/compressible/rhoCentralFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/Make/options
@@ -19,5 +19,6 @@ EXE_LIBS = \
-lrhoCentralFoam \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-ldynamicFvMesh \
-ltopoChangerFvMesh
diff --git a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options
index 775d63a111f..3c186a1e4e9 100644
--- a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
EXE_LIBS = \
-lfiniteVolume \
@@ -17,4 +17,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleTurbulenceModels \
+ -lthermoTools
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options
index 717240ffece..6a29940926f 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@@ -20,6 +20,7 @@ EXE_LIBS = \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options
index 74c9dc95385..3d58b8c4261 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options
@@ -21,6 +21,7 @@ EXE_LIBS = \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
-loverset
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options
index dd872bce900..fa15d297443 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@@ -19,5 +19,6 @@ EXE_LIBS = \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-latmosphericModels \
-lregionFaModels
diff --git a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options
index 9bb800efbd2..d69a4104311 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options
@@ -21,6 +21,7 @@ EXE_LIBS = \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
-lsampling \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
index 9e9ee05ce4a..53c75aa9074 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
@@ -18,4 +18,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleTurbulenceModels \
+ -lthermoTools
diff --git a/applications/solvers/compressible/sonicFoam/Make/options b/applications/solvers/compressible/sonicFoam/Make/options
index eed2e95cbe0..b5c8157122e 100644
--- a/applications/solvers/compressible/sonicFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/Make/options
@@ -16,4 +16,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleTurbulenceModels \
+ -lthermoTools
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
index b157cc8553b..424561b5f9e 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
@@ -21,6 +21,7 @@ EXE_LIBS = \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
index a9b16d2f251..badebdc5abf 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
@@ -23,6 +23,7 @@ EXE_LIBS = \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-latmosphericModels \
-ldynamicMesh \
-ldynamicFvMesh \
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options
index 1c97aae0837..75d0ded852b 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options
@@ -24,6 +24,7 @@ EXE_LIBS = \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-latmosphericModels \
-loverset \
-ldynamicFvMesh \
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
index 322b0c44887..da109f92609 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@@ -20,5 +20,6 @@ EXE_LIBS = \
-lradiationModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-latmosphericModels \
-lregionFaModels
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
index 941407a03c3..9f8b601014b 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@@ -37,6 +37,7 @@ EXE_LIBS = \
-lcombustionModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lradiationModels \
-lregionModels \
-lregionFaModels
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
index 02b07edfa58..e427bbfcfe7 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@@ -30,6 +30,7 @@ EXE_LIBS = \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lradiationModels \
-lfvOptions \
-lfaOptions \
diff --git a/applications/solvers/heatTransfer/solidFoam/Make/options b/applications/solvers/heatTransfer/solidFoam/Make/options
index ab6d205602b..5b05f2e141b 100644
--- a/applications/solvers/heatTransfer/solidFoam/Make/options
+++ b/applications/solvers/heatTransfer/solidFoam/Make/options
@@ -23,4 +23,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lsolidThermo \
-lradiationModels \
- -lspecie
+ -lspecie \
+ -lthermoTools
diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options
index 948d3589810..3aef1695c5c 100644
--- a/applications/solvers/heatTransfer/thermoFoam/Make/options
+++ b/applications/solvers/heatTransfer/thermoFoam/Make/options
@@ -18,4 +18,5 @@ EXE_LIBS = \
-lradiationModels \
-lspecie \
-lturbulenceModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleTurbulenceModels \
+ -lthermoTools
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index 3fa33f63640..67ee0526674 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -31,6 +31,7 @@ EXE_LIBS = \
-lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index 70ec7ed0803..81dbe563725 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -36,6 +36,7 @@ EXE_LIBS = \
-lsampling \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
index d307b5260ca..d2b25e0a671 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
@@ -36,6 +36,7 @@ EXE_LIBS = \
-ldynamicFvMesh \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
index 6b2a7257298..3e1485606fd 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@@ -31,6 +31,7 @@ EXE_LIBS = \
-lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
index 8612aedf9cf..2b0ed56ead2 100644
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
@@ -31,6 +31,7 @@ EXE_LIBS = \
-lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options
index 1d711963065..7ec29ea7dc8 100644
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@@ -31,6 +31,7 @@ EXE_LIBS = \
-lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
index 7a8c521c90e..4f13ec33645 100644
--- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
@@ -35,6 +35,7 @@ EXE_LIBS = \
-lsampling \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
index 151225cb078..44c94feb023 100644
--- a/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
@@ -31,6 +31,7 @@ EXE_LIBS = \
-lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianSpray \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
index c7501564d2e..879780b5e08 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
@@ -36,6 +36,7 @@ EXE_LIBS = \
-lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
index 18c419a4957..f94824bb630 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -29,6 +29,7 @@ EXE_LIBS = \
-lradiationModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lregionModels \
-lsurfaceFilmModels \
-lregionFaModels \
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options
index 067d0c03115..6c1aed4e311 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options
@@ -32,6 +32,7 @@ EXE_LIBS = \
-lradiationModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lregionModels \
-lsurfaceFilmModels \
-ldynamicMesh \
diff --git a/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options
index 7c6e5856725..c53fafcf5aa 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options
@@ -23,4 +23,5 @@ LIB_LIBS = \
-linterfaceProperties \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleTurbulenceModels \
+ -lthermoTools
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options
index 5fce6511368..8204d76d9ac 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options
@@ -26,4 +26,5 @@ EXE_LIBS = \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lVoFphaseCompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options
index 746ca9a4432..7e536a2c83f 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options
@@ -22,4 +22,5 @@ LIB_LIBS = \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lincompressibleTransportModels
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
index cc49e190f4f..3853db3847f 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
@@ -29,6 +29,7 @@ EXE_LIBS = \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lVoFphaseCompressibleTurbulenceModels \
-ldynamicMesh \
-ldynamicFvMesh
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
index 54392f419dc..e04e4e98c6c 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
@@ -36,6 +36,7 @@ EXE_LIBS = \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lVoFphaseCompressibleTurbulenceModels \
-lSLGThermo \
-lsurfaceFilmModels \
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
index 20f4d1aa685..185e98d9dd1 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
@@ -36,5 +36,6 @@ EXE_LIBS = \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lVoFphaseCompressibleTurbulenceModels \
-lgeometricVoF
diff --git a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options
index 58a1577a9c9..2b120f36ed9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options
@@ -32,6 +32,7 @@ EXE_LIBS = \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lVoFphaseCompressibleTurbulenceModels \
-ldynamicMesh \
-ldynamicFvMesh \
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
index b58b0af6b09..f130c88d986 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
@@ -21,4 +21,5 @@ EXE_LIBS = \
-lspecie \
-linterfaceProperties \
-lturbulenceModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleTurbulenceModels \
+ -lthermoTools
diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/options b/applications/solvers/multiphase/driftFluxFoam/Make/options
index d54870c6889..66084c852c1 100644
--- a/applications/solvers/multiphase/driftFluxFoam/Make/options
+++ b/applications/solvers/multiphase/driftFluxFoam/Make/options
@@ -22,4 +22,5 @@ EXE_LIBS = \
-ldriftFluxTransportModels \
-ldriftFluxRelativeVelocityModels \
-lturbulenceModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleTurbulenceModels \
+ -lthermoTools
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
index 41364692165..b20cb96a370 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
@@ -25,6 +25,7 @@ EXE_LIBS = \
-ldynamicFvMesh \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lcompressibleTransportModels \
-lradiationModels \
-lfluidThermophysicalModels \
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options
index c8a632087e3..aba9ee616dc 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options
@@ -20,4 +20,5 @@ EXE_LIBS = \
-lsampling \
-lreactingMultiphaseSystem \
-lreactingTwoPhaseSystem \
- -ltwoPhaseReactingTurbulenceModels
+ -ltwoPhaseReactingTurbulenceModels \
+ -lthermoTools
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
index fcd7558097f..ee6c9ca96c4 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
@@ -23,6 +23,7 @@ EXE_LIBS = \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lincompressibleTransportModels \
-lcompressibleTwoPhaseSystem \
-lphaseCompressibleTurbulenceModels
diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options
index 619a76c7a91..de525db6686 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/Make/options
+++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options
@@ -10,5 +10,6 @@ EXE_LIBS = \
-ldynamicMesh \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels
diff --git a/applications/utilities/miscellaneous/foamHelp/Make/options b/applications/utilities/miscellaneous/foamHelp/Make/options
index 280fed96921..4e185104f2f 100644
--- a/applications/utilities/miscellaneous/foamHelp/Make/options
+++ b/applications/utilities/miscellaneous/foamHelp/Make/options
@@ -10,5 +10,6 @@ EXE_LIBS = \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lradiationModels \
-lfluidThermophysicalModels
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options
index b3d092f1026..14a502de5a3 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options
@@ -6,5 +6,6 @@ LIB_LIBS = \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lradiationModels \
-lfluidThermophysicalModels
diff --git a/applications/utilities/postProcessing/postProcess/Make/options b/applications/utilities/postProcessing/postProcess/Make/options
index c2019e8d8c0..5fcf420ba66 100644
--- a/applications/utilities/postProcessing/postProcess/Make/options
+++ b/applications/utilities/postProcessing/postProcess/Make/options
@@ -19,6 +19,7 @@ EXE_LIBS = \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lincompressibleTransportModels \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
index a887778b7ba..8842d1fecad 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
@@ -16,6 +16,7 @@ EXE_LIBS = \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lfluidThermophysicalModels \
-lincompressibleTransportModels \
-lcompressibleTransportModels \
diff --git a/applications/utilities/preProcessing/setTurbulenceFields/Make/options b/applications/utilities/preProcessing/setTurbulenceFields/Make/options
index a887778b7ba..8842d1fecad 100644
--- a/applications/utilities/preProcessing/setTurbulenceFields/Make/options
+++ b/applications/utilities/preProcessing/setTurbulenceFields/Make/options
@@ -16,6 +16,7 @@ EXE_LIBS = \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lfluidThermophysicalModels \
-lincompressibleTransportModels \
-lcompressibleTransportModels \
diff --git a/src/Allwmake b/src/Allwmake
index ff447a10756..96071901af0 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -90,16 +90,13 @@ wmake $targetType combustionModels
wmakeLnInclude -u regionFaModels
wmakeLnInclude -u faOptions
-regionModels/Allwmake $targetType $*
-wmake $targetType fvOptions
-wmake $targetType faOptions
-wmake $targetType fvMotionSolver
-wmake $targetType regionFaModels
+wmakeLnInclude -u overset
+wmake $targetType overset
-lagrangian/Allwmake $targetType $*
+wmake $targetType fvOptions
-wmake $targetType overset
+wmake $targetType fvMotionSolver
# snappyHexMesh uses overset voxelMesh
mesh/Allwmake $targetType $*
@@ -111,15 +108,25 @@ wmake $targetType engine
conversion/Allwmake $targetType $*
-functionObjects/Allwmake $targetType $*
phaseSystemModels/Allwmake $targetType $*
+functionObjects/Allwmake $targetType $*
+
+wmake $targetType thermoTools
+
+regionModels/Allwmake $targetType $*
+
+wmake $targetType faOptions
+wmake $targetType regionFaModels
+
+lagrangian/Allwmake $targetType $*
+wmake $targetType functionObjects/lagrangian
+
wmake $targetType lumpedPointMotion
wmake $targetType sixDoFRigidBodyMotion
wmake $targetType sixDoFRigidBodyState
wmake $targetType rigidBodyDynamics
wmake $targetType rigidBodyMeshMotion
-wmake $targetType semiPermeableBaffle
wmake $targetType atmosphericModels
wmake $targetType optimisation/adjointOptimisation/adjoint
@@ -128,10 +135,6 @@ wmake $targetType optimisation/adjointOptimisation/adjoint
dynamicFaMesh/Allwmake $targetType $*
-# Needs access to Turbulence
-
-wmake $targetType thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties
-
#------------------------------------------------------------------------------
echo ========================================
diff --git a/src/TurbulenceModels/compressible/Make/files b/src/TurbulenceModels/compressible/Make/files
index 50a25f81c57..3197fb304ad 100644
--- a/src/TurbulenceModels/compressible/Make/files
+++ b/src/TurbulenceModels/compressible/Make/files
@@ -1,23 +1,4 @@
compressibleTurbulenceModel.C
turbulentFluidThermoModels/turbulentFluidThermoModels.C
-BCs = turbulentFluidThermoModels/derivedFvPatchFields
-
-$(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
-$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
-$(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
-$(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
-$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
-$(BCs)/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
-$(BCs)/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
-$(BCs)/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
-
-$(BCs)/temperatureCoupledBase/temperatureCoupledBase.C
-$(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
-$(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
-$(BCs)/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
-
-$(BCs)/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
-$(BCs)/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
-
LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels
diff --git a/src/faOptions/Make/options b/src/faOptions/Make/options
index 46c960d614b..f37f3d412a8 100644
--- a/src/faOptions/Make/options
+++ b/src/faOptions/Make/options
@@ -10,6 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+ -I$(LIB_SRC)/thermoTools/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude
LIB_LIBS = \
@@ -19,4 +20,5 @@ LIB_LIBS = \
-lmeshTools \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleTurbulenceModels \
+ -lthermoTools
diff --git a/src/functionObjects/Allwmake b/src/functionObjects/Allwmake
index 4a6d461b7f5..9c4009e728a 100755
--- a/src/functionObjects/Allwmake
+++ b/src/functionObjects/Allwmake
@@ -7,7 +7,6 @@ cd "${0%/*}" || exit # Run from this directory
wmake $targetType field
wmake $targetType forces
wmake $targetType initialisation
-wmake $targetType lagrangian
wmake $targetType utilities
wmake $targetType solvers
diff --git a/src/phaseSystemModels/Allwmake b/src/phaseSystemModels/Allwmake
index 64e3943b1db..02f197f2502 100755
--- a/src/phaseSystemModels/Allwmake
+++ b/src/phaseSystemModels/Allwmake
@@ -3,9 +3,9 @@ cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
#------------------------------------------------------------------------------
+reactingEuler/Allwmake $targetType $*
multiphaseInter/Allwmake $targetType $*
multiphaseEuler/Allwmake $targetType $*
-reactingEuler/Allwmake $targetType $*
twoPhaseEuler/Allwmake $targetType $*
twoPhaseInter/Allwmake $targetType $*
diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options
index 296ed5e2286..467ab19e8a6 100644
--- a/src/regionModels/regionCoupling/Make/options
+++ b/src/regionModels/regionCoupling/Make/options
@@ -14,6 +14,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+ -I$(LIB_SRC)/thermoTools/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/pyrolysisModels/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
@@ -28,4 +29,5 @@ LIB_LIBS = \
-lreactionThermophysicalModels \
-lSLGThermo \
-lturbulenceModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleTurbulenceModels \
+ -lthermoTools
diff --git a/src/regionModels/thermalBaffleModels/Make/options b/src/regionModels/thermalBaffleModels/Make/options
index 1f66d1e014b..2fd73a00af1 100644
--- a/src/regionModels/thermalBaffleModels/Make/options
+++ b/src/regionModels/thermalBaffleModels/Make/options
@@ -8,6 +8,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+ -I$(LIB_SRC)/thermoTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/mesh/extrudeModel/lnInclude
@@ -19,5 +20,6 @@ LIB_LIBS = \
-lsolidThermo \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
+ -lthermoTools \
-lradiationModels \
-ldynamicMesh
diff --git a/src/semiPermeableBaffle/Make/files b/src/semiPermeableBaffle/Make/files
deleted file mode 100644
index 2556e5fb536..00000000000
--- a/src/semiPermeableBaffle/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
-derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
-
-LIB = $(FOAM_LIBBIN)/libsemiPermeableBaffle
diff --git a/src/semiPermeableBaffle/Make/options b/src/semiPermeableBaffle/Make/options
deleted file mode 100644
index 10f6ee79d8d..00000000000
--- a/src/semiPermeableBaffle/Make/options
+++ /dev/null
@@ -1,17 +0,0 @@
-EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude
-
-LIB_LIBS = \
- -lfiniteVolume \
- -lmeshTools \
- -lcompressibleTransportModels \
- -lfluidThermophysicalModels \
- -lspecie \
- -lreactionThermophysicalModels \
- -lturbulenceModels
diff --git a/src/thermoTools/Make/files b/src/thermoTools/Make/files
new file mode 100644
index 00000000000..b66d55ed136
--- /dev/null
+++ b/src/thermoTools/Make/files
@@ -0,0 +1,24 @@
+BCs = derivedFvPatchFields
+
+$(BCs)/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
+$(BCs)/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
+
+$(BCs)/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+$(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
+$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+$(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+$(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
+$(BCs)/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
+$(BCs)/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
+$(BCs)/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
+
+$(BCs)/temperatureCoupledBase/temperatureCoupledBase.C
+$(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+$(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+$(BCs)/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
+
+$(BCs)/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+$(BCs)/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+
+LIB = $(FOAM_LIBBIN)/libthermoTools
diff --git a/src/thermoTools/Make/options b/src/thermoTools/Make/options
new file mode 100644
index 00000000000..d149ad3683a
--- /dev/null
+++ b/src/thermoTools/Make/options
@@ -0,0 +1,30 @@
+EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/regionCoupled/lnInclude \
+ -I$(LIB_SRC)/phaseSystemModels/multiphaseInter/phasesSystem/lnInclude \
+ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude
+
+LIB_LIBS = \
+ -lcompressibleTransportModels \
+ -lfiniteVolume \
+ -lmeshTools \
+ -lradiationModels \
+ -lfluidThermophysicalModels \
+ -lsolidThermo \
+ -lsolidSpecie \
+ -lturbulenceModels \
+ -lspecie \
+ -lcompressibleTurbulenceModels \
+ -lturbulenceModels \
+ -lreactionThermophysicalModels \
+ -lincompressibleMultiphaseSystems
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
rename to src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
rename to src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
diff --git a/src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
similarity index 100%
rename from src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
diff --git a/src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H
similarity index 100%
rename from src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H
diff --git a/src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
similarity index 100%
rename from src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
rename to src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
diff --git a/src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H
similarity index 100%
rename from src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H
rename to src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
similarity index 97%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
rename to src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index c3651276f37..b14d96c6929 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
- Copyright (C) 2017-2021 OpenCFD Ltd.
+ Copyright (C) 2017-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -31,6 +31,7 @@ License
#include "fluidThermo.H"
#include "solidThermo.H"
#include "turbulentFluidThermoModel.H"
+#include "multiphaseInterSystem.H"
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
@@ -255,11 +256,14 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
{
const auto* ptr =
- mesh.cfindObject<basicThermo>("phaseProperties");
+ mesh.cfindObject<multiphaseInterSystem>
+ (
+ multiphaseInterSystem::phasePropertiesName
+ );
if (ptr)
{
- return ptr->kappa(patchi);
+ return ptr->kappaEff(patchi);
}
}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
rename to src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
rename to src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H
rename to src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H b/src/thermoTools/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
rename to src/thermoTools/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
rename to src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
similarity index 100%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
rename to src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/files b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/files
deleted file mode 100644
index b245eb6bd50..00000000000
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
-
-
-LIB = $(FOAM_LIBBIN)/libliquidPropertiesFvPatchFields
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options
deleted file mode 100644
index 6c01649f5dc..00000000000
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options
+++ /dev/null
@@ -1,11 +0,0 @@
-EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
-
-LIB_LIBS = \
- -lfiniteVolume \
- -lmeshTools \
- -lthermophysicalProperties \
- -lcompressibleTurbulenceModels
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
index e473cc97cdd..482b9761be7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
@@ -16,8 +16,6 @@ FoamFile
#include "solverControls"
-libs (liquidPropertiesFvPatchFields);
-
application chtMultiRegionFoam;
startFrom startTime;
--
GitLab