consistency update - (in)compressibleTurbulenceModels -> (in)compressibleRASmodels

2025-11-28 03:28:01 +00:00 · 2008-06-18 10:06:06 +01:00
parent 79b0d0ca2b
commit 2b01d2f5da
43 changed files with 60 additions and 62 deletions
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@ -20,7 +20,7 @@ EXE_INC = \
 EXE_LIBS = \
    -lengine \
    -lmeshTools \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lbasicThermophysicalModels \
    -lcombustionThermophysicalModels \
    -lspecie \
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@ -12,7 +12,7 @@ EXE_LIBS = \
    -lengine \
    -lfiniteVolume \
    -lmeshTools \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lbasicThermophysicalModels \
    -lcombustionThermophysicalModels \
    -lspecie \
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@ -11,6 +11,6 @@ EXE_INC = \
 EXE_LIBS = \
    -lengine \
    -lfiniteVolume \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lbasicThermophysicalModels \
    -lspecie
--- a/applications/solvers/combustion/dieselEngineFoam/Make/options
+++ b/applications/solvers/combustion/dieselEngineFoam/Make/options
@ -18,7 +18,7 @@ EXE_INC = \

 EXE_LIBS = \
    -lengine \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lcombustionThermophysicalModels \
    -lfiniteVolume \
    -llagrangian \
--- a/applications/solvers/combustion/dieselFoam/Make/options
+++ b/applications/solvers/combustion/dieselFoam/Make/options
@ -16,7 +16,7 @@ EXE_INC = \
    -I$(LIB_SRC)/ODE/lnInclude

 EXE_LIBS = \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lcombustionThermophysicalModels \
    -lfiniteVolume \
    -llagrangian \
--- a/applications/solvers/combustion/engineFoam/Make/options
+++ b/applications/solvers/combustion/engineFoam/Make/options
@ -11,7 +11,7 @@ EXE_INC = \
 EXE_LIBS = \
    -lengine \
    -lfiniteVolume \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lbasicThermophysicalModels \
    -lcombustionThermophysicalModels \
    -lspecie \
--- a/applications/solvers/combustion/reactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/Make/options
@ -9,7 +9,7 @@ EXE_INC = \
    -I$(LIB_SRC)/ODE/lnInclude

 EXE_LIBS = \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lcombustionThermophysicalModels \
    -lfiniteVolume \
    -lspecie \
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@ -9,4 +9,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleTurbulenceModels
+    -lcompressibleRASmodels
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
@ -10,4 +10,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleTurbulenceModels
+    -lcompressibleRASmodels
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@ -9,4 +9,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleTurbulenceModels
+    -lcompressibleRASmodels
--- a/applications/solvers/compressible/rhoTurbFoam/Make/options
+++ b/applications/solvers/compressible/rhoTurbFoam/Make/options
@ -9,4 +9,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleTurbulenceModels
+    -lcompressibleRASmodels
--- a/applications/solvers/compressible/sonicTurbFoam/Make/options
+++ b/applications/solvers/compressible/sonicTurbFoam/Make/options
@ -7,6 +7,6 @@ EXE_INC = \
 EXE_LIBS = \
    -lfiniteVolume \
    -lmeshTools \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lbasicThermophysicalModels \
    -lspecie
--- a/applications/solvers/heatTransfer/buoyantFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantFoam/Make/options
@ -9,4 +9,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleTurbulenceModels
+    -lcompressibleRASmodels
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@ -9,4 +9,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleTurbulenceModels
+    -lcompressibleRASmodels
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
@ -11,4 +11,4 @@ EXE_LIBS = \
    -lbasicThermophysicalModels \
    -lspecie \
    -lradiation \
-    -lcompressibleTurbulenceModels
+    -lcompressibleRASmodels
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@ -13,4 +13,4 @@ EXE_LIBS = \
    -lfiniteVolume \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleTurbulenceModels
+    -lcompressibleRASmodels
--- a/applications/solvers/incompressible/boundaryFoam/Make/options
+++ b/applications/solvers/incompressible/boundaryFoam/Make/options
@ -5,7 +5,7 @@ EXE_INC = \
    -I$(LIB_SRC)/sampling/lnInclude

 EXE_LIBS = \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels \
    -lfiniteVolume \
    -lmeshTools \
--- a/applications/solvers/incompressible/simpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/Make/options
@ -4,7 +4,7 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels

 EXE_LIBS = \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels \
    -lfiniteVolume \
    -lmeshTools \
--- a/applications/solvers/incompressible/turbDyMFoam/Make/options
+++ b/applications/solvers/incompressible/turbDyMFoam/Make/options
@ -10,6 +10,6 @@ EXE_LIBS = \
    -ldynamicFvMesh \
    -ldynamicMesh \
    -lmeshTools \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels \
    -lfiniteVolume
--- a/applications/solvers/incompressible/turbFoam/Make/options
+++ b/applications/solvers/incompressible/turbFoam/Make/options
@ -4,7 +4,7 @@ EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude

 EXE_LIBS = \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels \
    -lfiniteVolume \
    -lmeshTools
--- a/applications/solvers/multiphase/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interDyMFoam/Make/options
@ -13,7 +13,7 @@ EXE_INC = \
 EXE_LIBS = \
    -linterfaceProperties \
    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lfiniteVolume \
    -ldynamicMesh \
    -lmeshTools \
--- a/applications/solvers/multiphase/rasCavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/rasCavitatingFoam/Make/options
@ -8,7 +8,7 @@ EXE_INC = \

 EXE_LIBS = \
    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lfiniteVolume \
    -lbarotropicCompressibilityModel

--- a/applications/solvers/multiphase/rasInterFoam/Make/options
+++ b/applications/solvers/multiphase/rasInterFoam/Make/options
@ -9,5 +9,5 @@ EXE_INC = \
 EXE_LIBS = \
    -linterfaceProperties \
    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lfiniteVolume
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@ -4,7 +4,7 @@ EXE_LIBS = \
    -lchemistryModel \
    -lcombustionThermophysicalModels \
    -lcompressibleLESmodels \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -ldecompositionMethods \
    -ldieselSpray \
    -ldynamicFvMesh \
@ -17,7 +17,7 @@ EXE_LIBS = \
    -lfvMotionSolvers \
    -lincompressibleLESmodels \
    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -linterfaceProperties \
    -llagrangianIntermediate \
    -llagrangian \
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
@ -11,9 +11,9 @@ EXE_LIBS = \
    $(FOAM_LIBBIN)/postCalc.o \
    -lfiniteVolume \
    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleLESmodels \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lcompressibleLESmodels
--- a/applications/utilities/postProcessing/stressField/stressComponents/Make/options
+++ b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
@ -5,5 +5,5 @@ EXE_INC = \

 EXE_LIBS = \
    -lfiniteVolume \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@ -5,6 +5,6 @@ EXE_INC = \

 EXE_LIBS = \
    -lfiniteVolume \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels \
    -lfiniteVolume
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@ -5,5 +5,5 @@ EXE_INC = \

 EXE_LIBS = \
    -lfiniteVolume \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels
--- a/applications/utilities/postProcessing/velocityField/Pe/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options
@ -14,9 +14,9 @@ EXE_LIBS = \
    -lfiniteVolume \
    -lmeshTools \
    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleLESmodels \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lcompressibleLESmodels
--- a/applications/utilities/postProcessing/wall/wallGradU/Make/options
+++ b/applications/utilities/postProcessing/wall/wallGradU/Make/options
@ -4,6 +4,6 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels

 EXE_LIBS = \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels \
    -lfiniteVolume
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
@ -6,7 +6,7 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude

 EXE_LIBS = \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lcombustionThermophysicalModels \
    -lfiniteVolume \
    -lspecie \
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@ -4,6 +4,6 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels

 EXE_LIBS = \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels \
    -lfiniteVolume
--- a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
@ -4,6 +4,6 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels

 EXE_LIBS = \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels \
    -lfiniteVolume
--- a/src/lagrangian/dieselSpray/Make/options
+++ b/src/lagrangian/dieselSpray/Make/options
@ -15,7 +15,7 @@ EXE_INC = \
 LIB_LIBS = \
    -llagrangian \
    -lfiniteVolume \
-    -lcompressibleTurbulenceModels \
+    -lcompressibleRASmodels \
    -lcompressibleLESmodels \
    -lLESdeltas \
    -lliquids \
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@ -23,4 +23,4 @@ LIB_LIBS = \
    -lspecie \
    -lbasicThermophysicalModels \
    -lcombustionThermophysicalModels \
-    -lcompressibleTurbulenceModels
+    -lcompressibleRASmodels
--- a/src/postProcessing/forces/Make/options
+++ b/src/postProcessing/forces/Make/options
@ -1,22 +1,20 @@
 EXE_INC = \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/LESmodels \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/transportModels \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels/LES \
+    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude

 LIB_LIBS = \
-    -lbasicThermophysicalModels \
-    -lspecie \
-    -lcompressibleLESmodels \
-    -lincompressibleLESmodels \
-    -lcompressibleTurbulenceModels \
-    -lincompressibleTurbulenceModels \
-    -lincompressibleTransportModels \
    -lfiniteVolume \
    -lmeshTools \
-    -lsampling
+    -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModels \
+    -lincompressibleLESmodels \
+    -lbasicThermophysicalModels \
+    -lspecie \
+    -lcompressibleTurbulenceModels \
+    -lcompressibleLESmodels
--- a/src/turbulenceModels/RAS/compressible/Make/files
+++ b/src/turbulenceModels/RAS/compressible/Make/files
@ -12,4 +12,4 @@ kOmegaSST/kOmegaSST.C

 wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C

-LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels
+LIB = $(FOAM_LIBBIN)/libcompressibleRASmodels
--- a/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C
+++ b/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C
@ -172,8 +172,8 @@ bool RASmodel::read()
        lookup("turbulence") >> turbulence_;
        RASmodelCoeffs_ = subDict(type() + "Coeffs");

-        subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
-        subDict("wallFunctionCoeffs").lookup("E") >> E_;
+        subDict("wallFunctionCoeffs").readIfPresent<scalar>("kappa", kappa_);
+        subDict("wallFunctionCoeffs").readIfPresent<scalar>("E", E_);

        yPlusLam_ = yPlusLam(kappa_, E_);

--- a/src/turbulenceModels/RAS/incompressible/Make/files
+++ b/src/turbulenceModels/RAS/incompressible/Make/files
@ -20,4 +20,4 @@ wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField
 wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
 wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C

-LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModels
+LIB = $(FOAM_LIBBIN)/libincompressibleRASmodels
--- a/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C
+++ b/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C
@ -169,8 +169,8 @@ bool RASmodel::read()
        lookup("turbulence") >> turbulence_;
        RASmodelCoeffs_ = subDict(type() + "Coeffs");

-        subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
-        subDict("wallFunctionCoeffs").lookup("E") >> E_;
+        subDict("wallFunctionCoeffs").readIfPresent<scalar>("kappa", kappa_);
+        subDict("wallFunctionCoeffs").readIfPresent<scalar>("E", E_);

        yPlusLam_ = yPlusLam(kappa_, E_);

--- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options
+++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options
@ -4,6 +4,6 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels

 EXE_LIBS = \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels \
    -lfiniteVolume
--- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options
+++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options
@ -18,4 +18,4 @@ EXE_LIBS = \
    -lcombustionThermophysicalModels \
    -lspecie \
    -lradiation \
-    -lcompressibleTurbulenceModels
+    -lcompressibleRASmodels
--- a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options
+++ b/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options
@ -4,7 +4,7 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels

 EXE_LIBS = \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleRASmodels \
    -lincompressibleTransportModels \
    -lfiniteVolume \
    -lmeshTools