From 945c4c3d1863dabee135b33abe0d0b413320a2fd Mon Sep 17 00:00:00 2001 From: Henry <Henry> Date: Tue, 17 Feb 2015 17:25:26 +0000 Subject: [PATCH] fluidThermo: Add compressibleTransportModel as base-class Needed to create generic compressible turbulence model library --- .../solvers/combustion/PDRFoam/Make/options | 2 + .../solvers/combustion/XiFoam/Make/options | 2 + .../solvers/combustion/chemFoam/Make/options | 2 + .../combustion/coldEngineFoam/Make/options | 2 + .../combustion/engineFoam/Make/options | 2 + .../solvers/combustion/fireFoam/Make/options | 2 + .../reactingFoam/LTSReactingFoam/Make/options | 2 + .../combustion/reactingFoam/Make/options | 2 + .../rhoReactingBuoyantFoam/Make/options | 2 + .../reactingFoam/rhoReactingFoam/Make/options | 2 + .../rhoCentralFoam/BCs/Make/options | 2 + .../compressible/rhoCentralFoam/Make/options | 2 + .../rhoCentralDyMFoam/Make/options | 2 + .../compressible/rhoPimpleFoam/Make/options | 2 + .../rhoLTSPimpleFoam/Make/options | 2 + .../rhoPimpleDyMFoam/Make/options | 2 + .../rhoPimpleFoam/rhoPimplecFoam/Make/options | 2 + .../compressible/rhoSimpleFoam/Make/options | 2 + .../rhoPorousSimpleFoam/Make/options | 2 + .../rhoSimpleFoam/rhoSimplecFoam/Make/options | 2 + .../compressible/sonicFoam/Make/options | 2 + .../sonicFoam/sonicDyMFoam/Make/options | 2 + .../buoyantPimpleFoam/Make/options | 2 + .../buoyantSimpleFoam/Make/options | 2 + .../chtMultiRegionFoam/Make/options | 2 + .../chtMultiRegionSimpleFoam/Make/options | 2 + .../heatTransfer/thermoFoam/Make/options | 2 + .../DPMFoam/DPMTurbulenceModels/Make/options | 1 + .../lagrangian/DPMFoam/MPPICFoam/Make/options | 1 + .../solvers/lagrangian/DPMFoam/Make/options | 1 + .../lagrangian/coalChemistryFoam/Make/options | 2 + .../Make/options | 2 + .../Make/options | 2 + .../reactingParcelFilmFoam/Make/options | 2 + .../LTSReactingParcelFoam/Make/options | 2 + .../reactingParcelFoam/Make/options | 2 + .../simpleReactingParcelFoam/Make/options | 2 + .../solvers/lagrangian/sprayFoam/Make/options | 2 + .../sprayFoam/sprayDyMFoam/Make/options | 2 + .../sprayFoam/sprayEngineFoam/Make/options | 2 + .../uncoupledKinematicParcelFoam/Make/options | 2 + .../compressibleInterFoam/Make/options | 1 + .../compressibleInterDyMFoam/Make/options | 1 + .../twoPhaseMixtureThermo/Make/options | 1 + .../Make/options | 1 + .../multiphaseMixtureThermo/Make/options | 1 + .../multiphase/twoPhaseEulerFoam/Make/options | 1 + .../interfacialModels/Make/options | 1 + .../twoPhaseSystem/Make/options | 1 + .../mesh/advanced/PDRMesh/Make/options | 1 + .../foamDebugSwitches/Make/options | 1 + .../execFlowFunctionObjects/Make/options | 2 + .../postProcessing/turbulence/R/Make/options | 2 + .../velocityField/Mach/Make/options | 11 +-- .../velocityField/Pe/Make/options | 2 + .../wall/wallHeatFlux/Make/options | 2 + .../wall/wallShearStress/Make/options | 2 + .../postProcessing/wall/yPlus/Make/options | 2 + .../thermophysical/chemkinToFoam/Make/options | 1 + .../compressible/Make/options | 15 ++-- .../turbulentFluidThermoModels.C | 1 + .../incompressible/Make/options | 4 +- src/combustionModels/Make/options | 6 +- src/lagrangian/Turbulence/Make/options | 14 ++-- src/lagrangian/coalCombustion/Make/options | 14 ++-- src/lagrangian/intermediate/Make/files.old | 70 ------------------- src/lagrangian/intermediate/Make/options | 15 ++-- src/lagrangian/spray/Make/options | 14 ++-- src/lagrangian/turbulence/Make/options | 14 ++-- .../functionObjects/forces/Make/options | 12 ++-- src/regionCoupled/Make/options | 14 ++-- src/regionModels/regionCoupling/Make/options | 11 +-- .../surfaceFilmModels/Make/options | 14 ++-- .../wallFunctions/Make/options | 14 ++-- .../thermalBaffleModels/Make/options | 14 ++-- .../SLGThermo/Make/options | 6 +- src/thermophysicalModels/basic/Make/options | 8 ++- .../basic/fluidThermo/fluidThermo.H | 10 +-- .../basic/psiThermo/psiThermo.C | 6 +- .../basic/psiThermo/psiThermo.H | 6 +- .../basic/rhoThermo/rhoThermo.C | 6 +- .../basic/rhoThermo/rhoThermo.H | 6 +- .../chemistryModel/Make/options | 9 ++- .../laminarFlameSpeed/Make/options | 6 +- .../radiation/Make/options | 15 ++-- .../reactionThermo/Make/options | 9 ++- .../compressibleTransportModel.C | 3 +- .../transportModel/transportModel.C | 3 +- 88 files changed, 260 insertions(+), 192 deletions(-) delete mode 100644 src/lagrangian/intermediate/Make/files.old diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index 6b89ae63835..4768728619e 100644 --- a/applications/solvers/combustion/PDRFoam/Make/options +++ b/applications/solvers/combustion/PDRFoam/Make/options @@ -6,6 +6,7 @@ EXE_INC = \ -IlaminarFlameSpeed/SCOPE \ -I$(LIB_SRC)/engine/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ @@ -22,6 +23,7 @@ EXE_LIBS = \ -lmeshTools \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index 4860d14f4d0..c30b39fdee3 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude\ -I$(LIB_SRC)/engine/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ @@ -19,6 +20,7 @@ EXE_LIBS = \ -lengine \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options index 79647a86109..f22b095fd9e 100644 --- a/applications/solvers/combustion/chemFoam/Make/options +++ b/applications/solvers/combustion/chemFoam/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude\ @@ -16,6 +17,7 @@ EXE_LIBS = \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index c49f5de1b84..0878858de7f 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/applications/solvers/combustion/coldEngineFoam/Make/options @@ -4,6 +4,7 @@ EXE_INC = \ -I../../compressible/rhoPimpleFoam \ -I$(LIB_SRC)/engine/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ @@ -17,6 +18,7 @@ EXE_LIBS = \ -lengine \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/engineFoam/Make/options index 0ede4569ef8..ab0bbe9ffa3 100644 --- a/applications/solvers/combustion/engineFoam/Make/options +++ b/applications/solvers/combustion/engineFoam/Make/options @@ -6,6 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/engine/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ @@ -20,6 +21,7 @@ EXE_LIBS = \ -lengine \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index cccf0a7dacf..fa336e9798f 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solid/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ @@ -38,6 +39,7 @@ EXE_LIBS = \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lsolidProperties \ -lsolidMixtureProperties \ diff --git a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options index 1028061264c..b11553a4717 100644 --- a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = -ggdb3 \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -22,6 +23,7 @@ EXE_LIBS = \ -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options index 5a7c91bce97..b6a03d74d80 100644 --- a/applications/solvers/combustion/reactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/Make/options @@ -7,6 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -21,6 +22,7 @@ EXE_LIBS = \ -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options index a9ea986c0ea..c5ced108f01 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -23,6 +24,7 @@ EXE_LIBS = \ -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options index a9ea986c0ea..c5ced108f01 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -23,6 +24,7 @@ EXE_LIBS = \ -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options index 6870682cf27..98566f524cf 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options @@ -1,10 +1,12 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude LIB_LIBS = \ -lfiniteVolume \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options index 1b16a7b364e..453c3460400 100644 --- a/applications/solvers/compressible/rhoCentralFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -IBCs/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ @@ -10,6 +11,7 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lrhoCentralFoam \ diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options index ed12311e043..fd02717d86f 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I.. \ -I../BCs/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ @@ -12,6 +13,7 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lrhoCentralFoam \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options index 8f38ef182ef..2a9889aa1a3 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options @@ -1,4 +1,5 @@ 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 \ @@ -9,6 +10,7 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options index 669cd4a3d4f..47357b963c5 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I.. \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ @@ -10,6 +11,7 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options index f94f65e6ac0..cff9147b314 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I.. \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ @@ -13,6 +14,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options index 669cd4a3d4f..47357b963c5 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I.. \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ @@ -10,6 +11,7 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options index dc86432603e..b30fe8bd005 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options @@ -1,4 +1,5 @@ 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 \ @@ -9,6 +10,7 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options index bf3eda58730..ee0ed0de421 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I.. \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ @@ -10,6 +11,7 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options index bf3eda58730..ee0ed0de421 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I.. \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ @@ -10,6 +11,7 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ diff --git a/applications/solvers/compressible/sonicFoam/Make/options b/applications/solvers/compressible/sonicFoam/Make/options index 92ca5cd17b9..6e90739a0b6 100644 --- a/applications/solvers/compressible/sonicFoam/Make/options +++ b/applications/solvers/compressible/sonicFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ @@ -9,6 +10,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options index 1561dffa7d1..a638d4dc9c5 100644 --- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options +++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I.. \ -I../../rhoPimpleFoam/rhoPimpleDyMFoam \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ @@ -14,6 +15,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options index fc4620b28b4..7138a3dad03 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ @@ -13,6 +14,7 @@ EXE_LIBS = \ -lsampling \ -lmeshTools \ -lfvOptions \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lradiationModels \ -lspecie \ diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options index 383ee341f19..ac34158a6eb 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ @@ -13,6 +14,7 @@ EXE_LIBS = \ -lfvOptions \ -lsampling \ -lmeshTools \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index 75695454d68..a470461654a 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ @@ -19,6 +20,7 @@ EXE_INC = \ EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lsolidThermo \ -lspecie \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options index e3c4d178f13..22155c7aa48 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ @@ -17,6 +18,7 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lsolidThermo \ -lspecie \ diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options index fc4620b28b4..7138a3dad03 100644 --- a/applications/solvers/heatTransfer/thermoFoam/Make/options +++ b/applications/solvers/heatTransfer/thermoFoam/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ @@ -13,6 +14,7 @@ EXE_LIBS = \ -lsampling \ -lmeshTools \ -lfvOptions \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lradiationModels \ -lspecie \ diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options index 716929b5620..61c92045615 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/foam/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options index 843220db55b..21a47f8893c 100644 --- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options @@ -6,6 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options index 5734ebb6587..074c01af002 100644 --- a/applications/solvers/lagrangian/DPMFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index 5689c1bab15..f678b0ce3f6 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ @@ -38,6 +39,7 @@ EXE_LIBS = \ -llagrangianTurbulence \ -lcoalCombustion\ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options index bec7663b66b..1f2e7a32db3 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ @@ -19,6 +20,7 @@ EXE_LIBS = \ -llagrangianIntermediate \ -llagrangianTurbulence \ -lthermophysicalFunctions \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options index 000a4abb2d8..a6a35147e96 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ @@ -23,6 +24,7 @@ EXE_LIBS = \ -llagrangianIntermediate \ -llagrangianTurbulence \ -lthermophysicalFunctions \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index 96880c05c03..fedb72a15ca 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -7,6 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ @@ -34,6 +35,7 @@ EXE_LIBS = \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lsolidProperties \ -lsolidMixtureProperties \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options index f0d8062ecba..fb26012e563 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options @@ -9,6 +9,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ @@ -36,6 +37,7 @@ EXE_LIBS = \ -llagrangianIntermediate \ -llagrangianTurbulence \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index cc79d690f73..a797d28efb2 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ @@ -36,6 +37,7 @@ EXE_LIBS = \ -llagrangianIntermediate \ -llagrangianTurbulence \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options index cc79d690f73..a797d28efb2 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ @@ -36,6 +37,7 @@ EXE_LIBS = \ -llagrangianIntermediate \ -llagrangianTurbulence \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index ac5b3ae3a08..5e01b76369a 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/Make/options @@ -10,6 +10,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/spray/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ @@ -34,6 +35,7 @@ EXE_LIBS = \ -llagrangianTurbulence \ -llagrangianSpray \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options index 6121be58c61..6ffe1ddd9fb 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options @@ -12,6 +12,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/spray/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ @@ -39,6 +40,7 @@ EXE_LIBS = \ -llagrangianTurbulence \ -llagrangianSpray \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options index d9a4851b74b..576c8921499 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options @@ -12,6 +12,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/spray/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ @@ -41,6 +42,7 @@ EXE_LIBS = \ -llagrangianTurbulence \ -llagrangianSpray \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options index 026161c0d5b..0726b90a3fe 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ @@ -17,6 +18,7 @@ EXE_LIBS = \ -llagrangianIntermediate \ -llagrangianTurbulence \ -lthermophysicalFunctions \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options index a36fe054145..b6e1aab57bd 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options @@ -10,6 +10,7 @@ EXE_INC = \ EXE_LIBS = \ -ltwoPhaseMixtureThermo \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options index 91f2d03a29d..01b2a8d5a16 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options @@ -14,6 +14,7 @@ EXE_INC = \ EXE_LIBS = \ -ltwoPhaseMixtureThermo \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options index 5c8c8df239b..ed39dee58bf 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options index 900ababa19f..b3ac65a11d6 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options @@ -11,6 +11,7 @@ EXE_INC = \ EXE_LIBS = \ -lmultiphaseMixtureThermo \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -linterfaceProperties \ diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options index 3740cf38fe9..f45eb9de173 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options @@ -4,6 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options index 4389799c48c..7faa436e572 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options @@ -15,6 +15,7 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options index 25d20582ba2..ff6d9b0ef04 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options @@ -11,5 +11,6 @@ EXE_INC = \ LIB_LIBS = \ -lcompressibleTwoPhaseSystem \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options index abefe54c4ef..ee40ebbc68a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options @@ -14,5 +14,6 @@ EXE_INC = \ LIB_LIBS = \ -lincompressibleTransportModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options index 9544389ab3c..acd5a23a15a 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/Make/options +++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options @@ -6,6 +6,7 @@ EXE_INC = \ EXE_LIBS = \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lmeshTools \ -ldynamicMesh \ diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index 23e78b6bf53..386b6826d32 100644 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options +++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options @@ -2,6 +2,7 @@ EXE_LIBS = \ -lautoMesh \ -lbarotropicCompressibilityModel \ -lsolidThermo \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lblockMesh \ -lchemistryModel \ diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options index 220589ea78c..7bd2704fff6 100644 --- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options +++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ @@ -14,6 +15,7 @@ EXE_LIBS = \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options index fefdc6b7800..f9c82ba46ff 100644 --- a/applications/utilities/postProcessing/turbulence/R/Make/options +++ b/applications/utilities/postProcessing/turbulence/R/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -12,6 +13,7 @@ EXE_LIBS = \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/utilities/postProcessing/velocityField/Mach/Make/options b/applications/utilities/postProcessing/velocityField/Mach/Make/options index d9cb09bedf3..2ddb93e3b6b 100644 --- a/applications/utilities/postProcessing/velocityField/Mach/Make/options +++ b/applications/utilities/postProcessing/velocityField/Mach/Make/options @@ -1,11 +1,14 @@ EXE_INC = \ -I$(LIB_SRC)/postProcessing/postCalc \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ $(FOAM_LIBBIN)/postCalc.o \ - -lfiniteVolume \ -lgenericPatchFields \ + -lcompressibleTransportModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ - -lspecie + -lspecie \ + -lfiniteVolume diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options index 09f921715f8..94d6863c13d 100644 --- a/applications/utilities/postProcessing/velocityField/Pe/Make/options +++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options @@ -4,6 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -14,6 +15,7 @@ EXE_LIBS = \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options index c1b5ad47e8d..bb92b85bf4d 100644 --- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options +++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude @@ -14,5 +15,6 @@ EXE_LIBS = \ -lfiniteVolume \ -lgenericPatchFields \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lsolidThermo diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options index 3235acdec90..488a36bec06 100644 --- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options +++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options @@ -4,6 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/turbulenceModels \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude @@ -12,6 +13,7 @@ EXE_LIBS = \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/utilities/postProcessing/wall/yPlus/Make/options b/applications/utilities/postProcessing/wall/yPlus/Make/options index cacf4eb319a..d46a9cbb90b 100644 --- a/applications/utilities/postProcessing/wall/yPlus/Make/options +++ b/applications/utilities/postProcessing/wall/yPlus/Make/options @@ -4,6 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -13,6 +14,7 @@ EXE_LIBS = \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/utilities/thermophysical/chemkinToFoam/Make/options b/applications/utilities/thermophysical/chemkinToFoam/Make/options index 3a2cb8bce46..f2744872294 100644 --- a/applications/utilities/thermophysical/chemkinToFoam/Make/options +++ b/applications/utilities/thermophysical/chemkinToFoam/Make/options @@ -4,5 +4,6 @@ EXE_INC = \ EXE_LIBS = \ -lreactionThermophysicalModels \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie diff --git a/src/TurbulenceModels/compressible/Make/options b/src/TurbulenceModels/compressible/Make/options index 1d4b638c6a8..fa99ca3a58a 100644 --- a/src/TurbulenceModels/compressible/Make/options +++ b/src/TurbulenceModels/compressible/Make/options @@ -1,18 +1,19 @@ EXE_INC = \ -I../turbulenceModels/lnInclude \ - -IlnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude + -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lsolidThermo \ -lsolidSpecie \ -lturbulenceModels \ - -lspecie + -lspecie \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C index d7b420f854c..ec6a3eb4dbc 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C @@ -23,6 +23,7 @@ License \*---------------------------------------------------------------------------*/ +#include "compressibleTransportModel.H" #include "fluidThermo.H" #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" diff --git a/src/TurbulenceModels/incompressible/Make/options b/src/TurbulenceModels/incompressible/Make/options index acb769c06fe..8eceaf533f8 100644 --- a/src/TurbulenceModels/incompressible/Make/options +++ b/src/TurbulenceModels/incompressible/Make/options @@ -1,8 +1,8 @@ EXE_INC = \ -I../turbulenceModels/lnInclude \ + -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -lincompressibleTransportModels \ diff --git a/src/combustionModels/Make/options b/src/combustionModels/Make/options index daf8e6d2e2b..eb02f088905 100644 --- a/src/combustionModels/Make/options +++ b/src/combustionModels/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -8,7 +9,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ - -lfiniteVolume \ + -lcompressibleTransportModels \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ - -lchemistryModel + -lchemistryModel \ + -lfiniteVolume diff --git a/src/lagrangian/Turbulence/Make/options b/src/lagrangian/Turbulence/Make/options index d3d76c7b624..da212dfd75d 100644 --- a/src/lagrangian/Turbulence/Make/options +++ b/src/lagrangian/Turbulence/Make/options @@ -1,9 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ @@ -19,15 +18,16 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ -llagrangian \ -llagrangianIntermediate \ -ldistributionModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ @@ -43,4 +43,6 @@ LIB_LIBS = \ -lregionModels \ -lsurfaceFilmModels \ -ldynamicFvMesh \ - -lsampling + -lsampling \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index a67fc62000f..04b133ba053 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -1,9 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ @@ -19,16 +18,17 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude + -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ -ldistributionModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ @@ -43,4 +43,6 @@ LIB_LIBS = \ -lincompressibleTransportModels \ -lregionModels \ -lsurfaceFilmModels \ - -ldynamicFvMesh + -ldynamicFvMesh \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/lagrangian/intermediate/Make/files.old b/src/lagrangian/intermediate/Make/files.old deleted file mode 100644 index 63909004cd9..00000000000 --- a/src/lagrangian/intermediate/Make/files.old +++ /dev/null @@ -1,70 +0,0 @@ -PARCELS=parcels -BASEPARCELS=$(PARCELS)/baseClasses -DERIVEDPARCELS=$(PARCELS)/derived - - -CLOUDS=clouds -BASECLOUDS=$(CLOUDS)/baseClasses -DERIVEDCLOUDS=$(CLOUDS)/derived - - -/* Parcels */ -$(BASEPARCELS)/reactingParcel/reactingParcel.C - - -/* Cloud base classes */ -$(BASECLOUDS)/kinematicCloud/kinematicCloud.C -$(BASECLOUDS)/thermoCloud/thermoCloud.C -$(BASECLOUDS)/reactingCloud/reactingCloud.C - - -/* kinematic parcel sub-models */ -KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel -$(KINEMATICPARCEL)/basicKinematicParcel.C -$(KINEMATICPARCEL)/defineBasicKinematicParcel.C -$(KINEMATICPARCEL)/makeBasicKinematicParcelSubmodels.C - -/* thermo parcel sub-models */ -THERMOPARCEL=$(DERIVEDPARCELS)/fluidThermoParcel -$(THERMOPARCEL)/fluidThermoParcel.C -$(THERMOPARCEL)/defineBasicThermoParcel.C -$(THERMOPARCEL)/makeBasicThermoParcelSubmodels.C - -/* reacting parcel sub-models */ -REACTINGPARCEL=$(DERIVEDPARCELS)/basicReactingParcel -$(REACTINGPARCEL)/basicReactingParcel.C -$(REACTINGPARCEL)/defineBasicReactingParcel.C -$(REACTINGPARCEL)/makeBasicReactingParcelSubmodels.C - - -/* bolt-on models */ - -submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C - -KINEMATICINJECTION=submodels/Kinematic/InjectionModel -$(KINEMATICINJECTION)/KinematicLookupTableInjection/kinematicParcelInjectionData.C -$(KINEMATICINJECTION)/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C -$(KINEMATICINJECTION)/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.C - -THERMOINJECTION=submodels/Thermodynamic/InjectionModel -$(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionData.C -$(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C -$(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.C - -REACTINGINJECTION=submodels/Reacting/InjectionModel -$(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionData.C -$(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C -$(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.C - - -/* integration schemes */ -IntegrationScheme/makeIntegrationSchemes.C - - -/* phase properties */ -phaseProperties/phaseProperties/phaseProperties.C -phaseProperties/phaseProperties/phasePropertiesIO.C -phaseProperties/phasePropertiesList/phasePropertiesList.C - - -LIB = $(FOAM_LIBBIN)/liblagrangianIntermediate diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index 3130009806c..a5a3b3c8ebd 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ @@ -16,14 +15,15 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ -llagrangian \ -ldistributionModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ @@ -36,5 +36,6 @@ LIB_LIBS = \ -lregionModels \ -lsurfaceFilmModels \ -ldynamicFvMesh \ - -lsampling - + -lsampling \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options index 76e4aeb7d60..3b5a4e72e95 100644 --- a/src/lagrangian/spray/Make/options +++ b/src/lagrangian/spray/Make/options @@ -1,10 +1,9 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/lagrangian/turbulence/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ @@ -21,16 +20,17 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ -ldistributionModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ @@ -46,4 +46,6 @@ LIB_LIBS = \ -lregionModels \ -lsurfaceFilmModels \ -ldynamicFvMesh \ - -lsampling + -lsampling \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/lagrangian/turbulence/Make/options b/src/lagrangian/turbulence/Make/options index 811fe0951ad..7b2fc4bea88 100644 --- a/src/lagrangian/turbulence/Make/options +++ b/src/lagrangian/turbulence/Make/options @@ -1,9 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ @@ -20,15 +19,16 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ -llagrangian \ -llagrangianIntermediate \ -ldistributionModels \ -lspecie \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ @@ -44,4 +44,6 @@ LIB_LIBS = \ -lregionModels \ -lsurfaceFilmModels \ -ldynamicFvMesh \ - -lsampling + -lsampling \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/postProcessing/functionObjects/forces/Make/options b/src/postProcessing/functionObjects/forces/Make/options index 3dd0b124845..eba068823b7 100644 --- a/src/postProcessing/functionObjects/forces/Make/options +++ b/src/postProcessing/functionObjects/forces/Make/options @@ -1,20 +1,22 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/transportModels \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ + -lcompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ + -lfileFormats \ -lfiniteVolume \ - -lmeshTools \ - -lfileFormats + -lmeshTools diff --git a/src/regionCoupled/Make/options b/src/regionCoupled/Make/options index e877774c16d..a9753c5115e 100644 --- a/src/regionCoupled/Make/options +++ b/src/regionCoupled/Make/options @@ -1,13 +1,15 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ - -lfiniteVolume \ - -lmeshTools \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options index ce912009504..39fe765eb47 100644 --- a/src/regionModels/regionCoupling/Make/options +++ b/src/regionModels/regionCoupling/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/AMIInterpolation/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -21,6 +20,8 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/pyrolysisModels/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -lregionModels \ @@ -29,7 +30,7 @@ LIB_LIBS = \ -lsolidChemistryModel \ -lreactionThermophysicalModels \ -lSLGThermo \ - -lfiniteVolume \ - -lmeshTools \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options index 88daf40fd4a..a0eb4828eaa 100644 --- a/src/regionModels/surfaceFilmModels/Make/options +++ b/src/regionModels/surfaceFilmModels/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ @@ -10,11 +9,12 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude + -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lliquidProperties \ @@ -24,4 +24,6 @@ LIB_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -ldistributionModels \ - -lregionModels + -lregionModels \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options index ca490a0744a..c736bdc8265 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ @@ -12,11 +11,12 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude + -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude\ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lliquidProperties \ @@ -28,4 +28,6 @@ LIB_LIBS = \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ -lregionModels \ - -lsurfaceFilmModels + -lsurfaceFilmModels \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/regionModels/thermalBaffleModels/Make/options b/src/regionModels/thermalBaffleModels/Make/options index bc36cf7dce5..9bd7bb9207b 100644 --- a/src/regionModels/thermalBaffleModels/Make/options +++ b/src/regionModels/thermalBaffleModels/Make/options @@ -1,22 +1,24 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/AMIInterpolation/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/mesh/extrudeModel/lnInclude + -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ + -lcompressibleTransportModels \ -lregionModels \ -lsolidThermo \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ - -lfiniteVolume \ - -lmeshTools \ -lradiationModels \ - -ldynamicMesh + -ldynamicMesh \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options index 7102ea2c618..c4f0b2a8a95 100644 --- a/src/thermophysicalModels/SLGThermo/Make/options +++ b/src/thermophysicalModels/SLGThermo/Make/options @@ -1,12 +1,14 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ + -lcompressibleTransportModels \ -lfiniteVolume diff --git a/src/thermophysicalModels/basic/Make/options b/src/thermophysicalModels/basic/Make/options index 5f64e9872d5..b5c859baf14 100644 --- a/src/thermophysicalModels/basic/Make/options +++ b/src/thermophysicalModels/basic/Make/options @@ -1,8 +1,10 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude - LIB_LIBS = \ - -lfiniteVolume + -lcompressibleTransportModels \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H index c5076991191..e18cda73431 100644 --- a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H +++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,6 +36,7 @@ SourceFiles #define fluidThermo_H #include "basicThermo.H" +#include "compressibleTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -48,7 +49,8 @@ namespace Foam class fluidThermo : - public basicThermo + public basicThermo, + public compressibleTransportModel { public: @@ -108,10 +110,10 @@ public: // Access to transport state variables //- Dynamic viscosity of mixture [kg/m/s] - virtual const volScalarField& mu() const = 0; + virtual tmp<volScalarField> mu() const = 0; //- Dynamic viscosity of mixture for patch [kg/m/s] - virtual const scalarField& mu(const label patchi) const = 0; + virtual tmp<scalarField> mu(const label patchi) const = 0; //- Kinematic viscosity of mixture [m^2/s] virtual tmp<volScalarField> nu() const; diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo.C b/src/thermophysicalModels/basic/psiThermo/psiThermo.C index 263674d1392..630402280a4 100644 --- a/src/thermophysicalModels/basic/psiThermo/psiThermo.C +++ b/src/thermophysicalModels/basic/psiThermo/psiThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,13 +108,13 @@ const Foam::volScalarField& Foam::psiThermo::psi() const } -const Foam::volScalarField& Foam::psiThermo::mu() const +Foam::tmp<Foam::volScalarField> Foam::psiThermo::mu() const { return mu_; } -const Foam::scalarField& Foam::psiThermo::mu(const label patchi) const +Foam::tmp<Foam::scalarField> Foam::psiThermo::mu(const label patchi) const { return mu_.boundaryField()[patchi]; } diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo.H b/src/thermophysicalModels/basic/psiThermo/psiThermo.H index f59c62247e1..f39700df56c 100644 --- a/src/thermophysicalModels/basic/psiThermo/psiThermo.H +++ b/src/thermophysicalModels/basic/psiThermo/psiThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -125,10 +125,10 @@ public: // Access to transport state variables //- Dynamic viscosity of mixture [kg/m/s] - virtual const volScalarField& mu() const; + virtual tmp<volScalarField> mu() const; //- Dynamic viscosity of mixture for patch [kg/m/s] - virtual const scalarField& mu(const label patchi) const; + virtual tmp<scalarField> mu(const label patchi) const; }; diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C index bfd171c40f3..ada7716c4a8 100644 --- a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C +++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -179,13 +179,13 @@ const Foam::volScalarField& Foam::rhoThermo::psi() const } -const Foam::volScalarField& Foam::rhoThermo::mu() const +Foam::tmp<Foam::volScalarField> Foam::rhoThermo::mu() const { return mu_; } -const Foam::scalarField& Foam::rhoThermo::mu(const label patchi) const +Foam::tmp<Foam::scalarField> Foam::rhoThermo::mu(const label patchi) const { return mu_.boundaryField()[patchi]; } diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H index 3067d51992d..5f1675edfae 100644 --- a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H +++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -140,10 +140,10 @@ public: // Access to transport state variables //- Dynamic viscosity of mixture [kg/m/s] - virtual const volScalarField& mu() const; + virtual tmp<volScalarField> mu() const; //- Dynamic viscosity of mixture for patch [kg/m/s] - virtual const scalarField& mu(const label patchi) const; + virtual tmp<scalarField> mu(const label patchi) const; }; diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options index b8f70e8dfac..de52d7e6ae8 100644 --- a/src/thermophysicalModels/chemistryModel/Make/options +++ b/src/thermophysicalModels/chemistryModel/Make/options @@ -1,16 +1,19 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/functions/Polynomial \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/ODE/lnInclude + -I$(LIB_SRC)/ODE/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ -lthermophysicalFunctions \ - -lODE + -lODE \ + -lfiniteVolume diff --git a/src/thermophysicalModels/laminarFlameSpeed/Make/options b/src/thermophysicalModels/laminarFlameSpeed/Make/options index fe682dababb..f97edb8458c 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/Make/options +++ b/src/thermophysicalModels/laminarFlameSpeed/Make/options @@ -1,8 +1,10 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/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)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ + -lcompressibleTransportModels \ -lfiniteVolume diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options index 248131e32ed..726b76e7644 100644 --- a/src/thermophysicalModels/radiation/Make/options +++ b/src/thermophysicalModels/radiation/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ @@ -9,17 +8,19 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude - + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfiniteVolume \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lsolidThermo \ - -lmeshTools \ -lSLGThermo \ -lsolidMixtureProperties \ -lliquidMixtureProperties \ -lsolidProperties \ - -lliquidProperties + -lliquidProperties \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/thermophysicalModels/reactionThermo/Make/options b/src/thermophysicalModels/reactionThermo/Make/options index 1758b4921ee..f59f44fc8d3 100644 --- a/src/thermophysicalModels/reactionThermo/Make/options +++ b/src/thermophysicalModels/reactionThermo/Make/options @@ -1,14 +1,13 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude - + -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ - -lfiniteVolume \ + -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lsolidSpecie \ - -lmeshTools + -lfiniteVolume diff --git a/src/transportModels/compressible/compressibleTransportModel/compressibleTransportModel.C b/src/transportModels/compressible/compressibleTransportModel/compressibleTransportModel.C index 8d33e73ddf4..b23561b4aa9 100644 --- a/src/transportModels/compressible/compressibleTransportModel/compressibleTransportModel.C +++ b/src/transportModels/compressible/compressibleTransportModel/compressibleTransportModel.C @@ -35,8 +35,7 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::compressibleTransportModel::compressibleTransportModel -() +Foam::compressibleTransportModel::compressibleTransportModel() {} diff --git a/src/transportModels/incompressible/transportModel/transportModel.C b/src/transportModels/incompressible/transportModel/transportModel.C index a0bf6637a4b..ea356107620 100644 --- a/src/transportModels/incompressible/transportModel/transportModel.C +++ b/src/transportModels/incompressible/transportModel/transportModel.C @@ -35,8 +35,7 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::transportModel::transportModel -() +Foam::transportModel::transportModel() {} -- GitLab