diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C index 9cf66cc3b3..af20a46ea9 100644 --- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C +++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" -#include "incompressible/turbulenceModel/turbulenceModel.H" +#include "incompressible/RASmodel/RASmodel.H" #include "MRFZones.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H b/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H index 390e3b0149..fc1c30b19f 100644 --- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H +++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H @@ -36,9 +36,9 @@ singlePhaseTransportModel laminarTransport(U, phi); - autoPtr turbulence + autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::RASmodel::New(U, phi, laminarTransport) ); diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties index 9b738288b3..ca792d9f45 100644 --- a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties index 91e74e5b1e..ba6e807f82 100644 --- a/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties +++ b/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel LaunderSharmaKE; +RASmodel LaunderSharmaKE; turbulence on; diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties b/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties index 24ae5e9082..3e1e16755c 100644 --- a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties +++ b/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel LaunderSharmaKE; +RASmodel LaunderSharmaKE; turbulence on; diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties b/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties index 76158edd86..f979cb3a80 100644 --- a/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties +++ b/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties @@ -24,7 +24,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Turbulence model selection -turbulenceModel kEpsilon; +RASmodel kEpsilon; // Do you wish to calculate turbulence? turbulence on; diff --git a/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties index e2e899ca1a..df50c86414 100644 --- a/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties +++ b/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel laminar; +RASmodel laminar; turbulence off; diff --git a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties index 289c15e14a..7128f95ea1 100644 --- a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties +++ b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties index 289c15e14a..7128f95ea1 100644 --- a/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties +++ b/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties index 289c15e14a..7128f95ea1 100644 --- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties +++ b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties index cf62556002..b14ec53716 100644 --- a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties +++ b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties @@ -16,7 +16,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties b/tutorials/engineFoam/kivaTest/constant/turbulenceProperties index a723387ddb..68a30fe751 100644 --- a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties +++ b/tutorials/engineFoam/kivaTest/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties index e439b7fdb0..c0e5f76583 100644 --- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties +++ b/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties @@ -22,8 +22,8 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// turbulenceModel kEpsilon; -turbulenceModel laminar; +// RASmodel kEpsilon; +RASmodel laminar; turbulence off; diff --git a/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties b/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties index 2c2118c78a..6f67a329b1 100644 --- a/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties +++ b/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties b/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties index 605d31eb8f..a10685dcae 100644 --- a/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties +++ b/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties @@ -16,7 +16,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; laminarCoeffs diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties index 605d31eb8f..a10685dcae 100644 --- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties +++ b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties @@ -16,7 +16,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; laminarCoeffs diff --git a/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties b/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties index 639f7418bf..aa269bc9b6 100644 --- a/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties +++ b/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties @@ -24,7 +24,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Turbulence model selection -turbulenceModel kOmegaSST; //kEpsilon; +RASmodel kOmegaSST; //kEpsilon; // Do you wish to calculate turbulence? turbulence on; diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H index 1191d94b02..dba0679738 100644 --- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H +++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H @@ -41,9 +41,9 @@ Info<< "Creating turbulence model\n" << endl; - autoPtr turbulence + autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::RASmodel::New ( rho, U, diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C index 0b9edd0b3c..91af3c9dc9 100644 --- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C +++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "basicThermo.H" -#include "compressible/turbulenceModel/turbulenceModel.H" +#include "compressible/RASmodel/RASmodel.H" #include "basicThermoCloud.H" #include "basicKinematicCloud.H" diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties index 7d4495dc58..038378f511 100644 --- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties +++ b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties @@ -24,7 +24,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Turbulence model selection -turbulenceModel kEpsilon; +RASmodel kEpsilon; // Do you wish to calculate turbulence? turbulence on; diff --git a/tutorials/settlingFoam/dahl/constant/turbulenceProperties b/tutorials/settlingFoam/dahl/constant/turbulenceProperties index 2190843e1d..e1c73326f9 100644 --- a/tutorials/settlingFoam/dahl/constant/turbulenceProperties +++ b/tutorials/settlingFoam/dahl/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/settlingFoam/tank3D/constant/turbulenceProperties b/tutorials/settlingFoam/tank3D/constant/turbulenceProperties index 2190843e1d..e1c73326f9 100644 --- a/tutorials/settlingFoam/tank3D/constant/turbulenceProperties +++ b/tutorials/settlingFoam/tank3D/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties index f664723edb..283f8136c9 100644 --- a/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties index f664723edb..283f8136c9 100644 --- a/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties index f664723edb..283f8136c9 100644 --- a/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties b/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties index bebe8455e5..4f812b18a7 100644 --- a/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties +++ b/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kOmegaSST; +RASmodel kOmegaSST; turbulence on; diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H b/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H index 9f1017f23e..aab42f3534 100644 --- a/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H +++ b/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H @@ -46,9 +46,9 @@ singlePhaseTransportModel laminarTransport(Urel, phi); - autoPtr turbulence + autoPtr turbulence ( - incompressible::turbulenceModel::New(Urel, phi, laminarTransport) + incompressible::RASmodel::New(Urel, phi, laminarTransport) ); Info<< "Creating SRF model\n" << endl; diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C b/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C index 7480f08dcc..5e89702f0f 100644 --- a/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C +++ b/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" -#include "incompressible/turbulenceModel/turbulenceModel.H" +#include "incompressible/RASmodel/RASmodel.H" #include "SRFModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties b/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties index c24f035fe5..1e9b27636e 100644 --- a/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties +++ b/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel LaunderSharmaKE; +RASmodel LaunderSharmaKE; turbulence on; diff --git a/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties b/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties index 6a3194ffd3..60c47b9acf 100644 --- a/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties +++ b/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/turbFoam/cavity/constant/turbulenceProperties b/tutorials/turbFoam/cavity/constant/turbulenceProperties index f664723edb..283f8136c9 100644 --- a/tutorials/turbFoam/cavity/constant/turbulenceProperties +++ b/tutorials/turbFoam/cavity/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence on; diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties index dc05e1c634..0046e64aad 100644 --- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties +++ b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulenceModel kEpsilon; +RASmodel kEpsilon; turbulence off;