diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index 09322fe865..29dd613968 100644 --- 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 \ diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index c6457c2826..2b553eed81 100644 --- 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 \ diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index d932a5dbc1..249e46bef1 100644 --- 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 diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options index c3928b4274..65b7d2478f 100644 --- 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 \ diff --git a/applications/solvers/combustion/dieselFoam/Make/options b/applications/solvers/combustion/dieselFoam/Make/options index b19c304f70..6ebc1c6191 100644 --- 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 \ diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/engineFoam/Make/options index 952aa3091a..afda5ce4a5 100644 --- 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 \ diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options index ad9827feb7..179a2cfd6b 100644 --- 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 \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options index 1679646dc1..dcd95f7661 100644 --- 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 diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options index 46c3f63621..7325d5b420 100644 --- 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 diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options index 1679646dc1..dcd95f7661 100644 --- 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 diff --git a/applications/solvers/compressible/rhoTurbFoam/Make/options b/applications/solvers/compressible/rhoTurbFoam/Make/options index 9a953a45d4..c28d6dac5f 100644 --- 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 diff --git a/applications/solvers/compressible/sonicTurbFoam/Make/options b/applications/solvers/compressible/sonicTurbFoam/Make/options index 42838550d1..ebdb2234e7 100644 --- 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 diff --git a/applications/solvers/heatTransfer/buoyantFoam/Make/options b/applications/solvers/heatTransfer/buoyantFoam/Make/options index ea9f7366bc..0a3761fdc6 100644 --- 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 diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options index 1679646dc1..dcd95f7661 100644 --- 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 diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options index 5210108717..54af7f6d96 100644 --- 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 diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index 2fe2cc72a3..dc9d23c632 100644 --- 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 diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options index 89e1642a87..73c556dcf0 100644 --- 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 \ diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options index 13680640c4..c1232be74c 100644 --- 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 \ diff --git a/applications/solvers/incompressible/turbDyMFoam/Make/options b/applications/solvers/incompressible/turbDyMFoam/Make/options index 633daf3e73..53b2a61605 100644 --- 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 diff --git a/applications/solvers/incompressible/turbFoam/Make/options b/applications/solvers/incompressible/turbFoam/Make/options index b8036f1d38..4c0e0228c1 100644 --- 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 diff --git a/applications/solvers/multiphase/interDyMFoam/Make/options b/applications/solvers/multiphase/interDyMFoam/Make/options index ddd0160b00..7b811aa97d 100644 --- 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 \ diff --git a/applications/solvers/multiphase/rasCavitatingFoam/Make/options b/applications/solvers/multiphase/rasCavitatingFoam/Make/options index 4c09b3efbe..0450978390 100644 --- 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 diff --git a/applications/solvers/multiphase/rasInterFoam/Make/options b/applications/solvers/multiphase/rasInterFoam/Make/options index 27d86562c3..9289b0f35e 100644 --- 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 diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/Make/files b/applications/utilities/mesh/conversion/cfx4ToFoam/Make/files new file mode 100644 index 0000000000..4d286131ba --- /dev/null +++ b/applications/utilities/mesh/conversion/cfx4ToFoam/Make/files @@ -0,0 +1,4 @@ +hexBlock.C +cfx4ToFoam.C + +EXE = $(FOAM_APPBIN)/cfx4ToFoam diff --git a/applications/utilities/mesh/conversion/cfxToFoam/Make/options b/applications/utilities/mesh/conversion/cfx4ToFoam/Make/options similarity index 100% rename from applications/utilities/mesh/conversion/cfxToFoam/Make/options rename to applications/utilities/mesh/conversion/cfx4ToFoam/Make/options diff --git a/applications/utilities/mesh/conversion/cfxToFoam/block.C b/applications/utilities/mesh/conversion/cfx4ToFoam/block.C similarity index 100% rename from applications/utilities/mesh/conversion/cfxToFoam/block.C rename to applications/utilities/mesh/conversion/cfx4ToFoam/block.C diff --git a/applications/utilities/mesh/conversion/cfxToFoam/block.H b/applications/utilities/mesh/conversion/cfx4ToFoam/block.H similarity index 100% rename from applications/utilities/mesh/conversion/cfxToFoam/block.H rename to applications/utilities/mesh/conversion/cfx4ToFoam/block.H diff --git a/applications/utilities/mesh/conversion/cfxToFoam/cfxToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C similarity index 99% rename from applications/utilities/mesh/conversion/cfxToFoam/cfxToFoam.C rename to applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C index 507671cb06..ca2677f745 100644 --- a/applications/utilities/mesh/conversion/cfxToFoam/cfxToFoam.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 \*---------------------------------------------------------------------------*/ diff --git a/applications/utilities/mesh/conversion/cfxToFoam/hexBlock.C b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C similarity index 100% rename from applications/utilities/mesh/conversion/cfxToFoam/hexBlock.C rename to applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C diff --git a/applications/utilities/mesh/conversion/cfxToFoam/hexBlock.H b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H similarity index 100% rename from applications/utilities/mesh/conversion/cfxToFoam/hexBlock.H rename to applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H diff --git a/applications/utilities/mesh/conversion/cfxToFoam/Make/files b/applications/utilities/mesh/conversion/cfxToFoam/Make/files deleted file mode 100644 index d4893733f7..0000000000 --- a/applications/utilities/mesh/conversion/cfxToFoam/Make/files +++ /dev/null @@ -1,4 +0,0 @@ -hexBlock.C -cfxToFoam.C - -EXE = $(FOAM_APPBIN)/cfxToFoam diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index 161b9c3c8e..ffed4ff037 100644 --- 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 \ diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options index f6c92548fc..42c58cc6ab 100644 --- 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 diff --git a/applications/utilities/postProcessing/stressField/stressComponents/Make/options b/applications/utilities/postProcessing/stressField/stressComponents/Make/options index b0d119d888..458b040fcb 100644 --- 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 diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options index 8b6867b6fc..90c4889f03 100644 --- 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 diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options index b0d119d888..458b040fcb 100644 --- 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 diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options index eae57baa89..ae1ccb29ac 100644 --- 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 diff --git a/applications/utilities/postProcessing/wall/wallGradU/Make/options b/applications/utilities/postProcessing/wall/wallGradU/Make/options index 6437903e0c..882657bf9f 100644 --- 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 diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options index bcd694b425..525ab7dffd 100644 --- 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 \ diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options index 6437903e0c..882657bf9f 100644 --- 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 diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options index 6437903e0c..882657bf9f 100644 --- 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 diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H index 9c8ecd7ce9..112d555aa8 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H @@ -124,7 +124,7 @@ public: //- Update the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); }; diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H index c26e18656f..36d496c189 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H @@ -117,7 +117,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ) = 0; //- Initialise swap of patch point values diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/mixed/mixedPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/mixed/mixedPointPatchField.H index ec6d488ffe..8dfa999778 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/mixed/mixedPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/mixed/mixedPointPatchField.H @@ -183,7 +183,7 @@ public: //- Update the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H index 638a763fb1..a4c58c48d9 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H @@ -163,7 +163,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H index 45eb499109..b8ed74855e 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H @@ -154,7 +154,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ) {} diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H index f7503f0fe8..2f671fcf4f 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H @@ -165,7 +165,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ) {} diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H index 2ab5582a47..16fa7ad0cc 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H @@ -128,7 +128,7 @@ public: //- Update the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); }; diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchField.H index f522494cfa..ac7ebdf0c0 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchField.H @@ -140,7 +140,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ) {} diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H index e563bfd8ba..2d1ac51261 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H @@ -353,14 +353,14 @@ public: //- Initialise evaluation of the patch field (do nothing) virtual void initEvaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ) {} //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H index 33435b74f8..e9afbf96a1 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H @@ -131,7 +131,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); //- Return face-gradient transform diagonal diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H index 73fb7bc5eb..a06398c6d3 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H @@ -196,7 +196,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); //- Return face-gradient transform diagonal diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H index 65ce0cb132..4826953d38 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H @@ -168,7 +168,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); //- Return the matrix diagonal coefficients corresponding to the diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H index 9a93e8fe39..db309fc1da 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H @@ -201,7 +201,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); //- Return the matrix diagonal coefficients corresponding to the diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H index c957382498..be1024a6fc 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H @@ -163,14 +163,14 @@ public: //- Initialise the evaluation of the patch field virtual void initEvaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ) {} //- Evaluate the patch field, sets Updated to false virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ) {} diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H index 0e07509dc3..78b18782b2 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H @@ -137,7 +137,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); //- Return the matrix diagonal coefficients corresponding to the diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H index c6fb2e621b..e1720a6077 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H @@ -131,7 +131,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); //- Return face-gradient transform diagonal diff --git a/src/finiteVolume/fields/fvPatchFields/derived/expDirectionMixed/expDirectionMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/expDirectionMixed/expDirectionMixedFvPatchField.H index f7df917c5d..cf1a323840 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/expDirectionMixed/expDirectionMixedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/expDirectionMixed/expDirectionMixedFvPatchField.H @@ -202,7 +202,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); //- Return the matrix diagonal coefficients corresponding to the diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H index b70afac296..f671c22b5f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H @@ -165,7 +165,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); //- Return face-gradient transform diagonal diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.H index c0e7d8b6f3..c3485d1b96 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.H @@ -127,7 +127,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H index 2d6997f6f8..49d50dfeb8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H @@ -164,7 +164,7 @@ public: //- Evaluate the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); //- Return face-gradient transform diagonal diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H index 39bbccea54..066c0f2333 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H @@ -349,14 +349,14 @@ public: //- Initialise the evaluation of the patch field virtual void initEvaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ) {} //- Evaluate the patch field, sets Updated to false virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H index a818bad299..9ac7d4ed25 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H @@ -223,7 +223,7 @@ public: //- Update the patch field virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); //- Write diff --git a/src/lagrangian/dieselSpray/Make/options b/src/lagrangian/dieselSpray/Make/options index 247a700715..c5989a9bc9 100644 --- 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 \ diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index 82e57d5c5e..f1ee6e0b4b 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -23,4 +23,4 @@ LIB_LIBS = \ -lspecie \ -lbasicThermophysicalModels \ -lcombustionThermophysicalModels \ - -lcompressibleTurbulenceModels + -lcompressibleRASmodels diff --git a/src/postProcessing/forces/Make/options b/src/postProcessing/forces/Make/options index e936181ee1..7e10dd3a1d 100644 --- a/src/postProcessing/forces/Make/options +++ b/src/postProcessing/forces/Make/options @@ -12,9 +12,9 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModels \ + -lincompressibleRASmodels \ -lincompressibleLESmodels \ -lbasicThermophysicalModels \ -lspecie \ - -lcompressibleTurbulenceModels \ + -lcompressibleRASmodels \ -lcompressibleLESmodels diff --git a/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H index 29a52fca67..7b2cc25e73 100644 --- a/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H @@ -141,7 +141,7 @@ public: //- Evaluate the patchField virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); }; diff --git a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H index 5bf9968fe5..4d74510d11 100644 --- a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H @@ -131,7 +131,7 @@ public: //- Evaluate the patchField virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); }; diff --git a/src/turbulenceModels/RAS/compressible/Make/files b/src/turbulenceModels/RAS/compressible/Make/files index 03430510a0..1b5a588bdb 100644 --- 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 diff --git a/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C b/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C index ca5bc76411..ecbd901c3b 100644 --- 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("kappa", kappa_); + subDict("wallFunctionCoeffs").readIfPresent("E", E_); yPlusLam_ = yPlusLam(kappa_, E_); diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H index 081f68ae67..516543d845 100644 --- a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H @@ -178,7 +178,7 @@ public: //- Evaluate the patchField virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); diff --git a/src/turbulenceModels/RAS/incompressible/Make/files b/src/turbulenceModels/RAS/incompressible/Make/files index a8f6b81c88..7c0bba95c7 100644 --- 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 diff --git a/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C b/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C index e1c09563fa..a6e9b14d16 100644 --- 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("kappa", kappa_); + subDict("wallFunctionCoeffs").readIfPresent("E", E_); yPlusLam_ = yPlusLam(kappa_, E_); diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H index b782fd83f5..6d7c53e09e 100644 --- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H @@ -178,7 +178,7 @@ public: //- Evaluate the patchField virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H index b2b2509e79..6f679df146 100644 --- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H @@ -133,7 +133,7 @@ public: //- Evaluate the patchField virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); }; diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H index ba56ff00de..ee22de35eb 100644 --- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H @@ -133,7 +133,7 @@ public: //- Evaluate the patchField virtual void evaluate ( - const Pstream::commsTypes commsType=Pstream::Pstream::blocking + const Pstream::commsTypes commsType=Pstream::blocking ); }; diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options b/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options index 6437903e0c..882657bf9f 100644 --- 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 diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options index ac65c845e2..a551b9c721 100644 --- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options +++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options @@ -18,4 +18,4 @@ EXE_LIBS = \ -lcombustionThermophysicalModels \ -lspecie \ -lradiation \ - -lcompressibleTurbulenceModels + -lcompressibleRASmodels diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options b/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options index be658f22d0..54831153fa 100644 --- 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