Merge branch 'master' of ssh://noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

2025-11-28 03:28:01 +00:00 · 2008-06-18 12:53:20 +01:00
parent 5b4983c759 f525d1811f
commit cc3289a606
60 changed files with 99 additions and 84 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/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/kEpsilon.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/kEpsilon.H
@ -16,7 +16,12 @@ if(turbulence)
    (
        fvm::ddt(beta, epsilon)
      + fvm::div(phib, epsilon)
-      - fvm::laplacian(alphaEps*nuEffb, epsilon)
+      - fvm::laplacian
+        (
+            alphaEps*nuEffb,
+            epsilon,
+            "laplacian(alphaEps*nuEffb,epsilon)"
+        )
      ==
         C1*beta*G*epsilon/k
       - fvm::Sp(C2*beta*epsilon/k, epsilon)
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/Make/files
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/Make/files
@ -0,0 +1,4 @@
+hexBlock.C
+cfx4ToFoam.C
+
+EXE = $(FOAM_APPBIN)/cfx4ToFoam
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/Make/options
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/Make/options
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/block.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/block.C
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/block.H
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/block.H
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@ -23,10 +23,10 @@ License
    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

 Application
-    cfxToFoam
+    cfx4ToFoam

 Description
-    Converts a CFX mesh to FOAM format
+    Converts a CFX 4 mesh to FOAM format

 \*---------------------------------------------------------------------------*/

--- a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
--- a/applications/utilities/mesh/conversion/cfxToFoam/Make/files
+++ b/applications/utilities/mesh/conversion/cfxToFoam/Make/files
@ -1,4 +0,0 @@
-hexBlock.C
-cfxToFoam.C
-
-EXE = $(FOAM_APPBIN)/cfxToFoam
--- 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