consistency update

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"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H

@@ -36,9 +36,9 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<incompressible::turbulenceModel> turbulence
+    autoPtr<incompressible::RASmodel> turbulence
     (
-        incompressible::turbulenceModel::New(U, phi, laminarTransport)
+        incompressible::RASmodel::New(U, phi, laminarTransport)
     );
 
 

tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel LaunderSharmaKE;
+RASmodel            LaunderSharmaKE;
 
 turbulence      on;
 

tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel LaunderSharmaKE;
+RASmodel            LaunderSharmaKE;
 
 turbulence      on;
 

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;

tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel laminar;
+RASmodel            laminar;
 
 turbulence      off;
 

tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties

@@ -16,7 +16,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/engineFoam/kivaTest/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties

@@ -22,8 +22,8 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// turbulenceModel kEpsilon;
+// RASmodel            kEpsilon;
-turbulenceModel laminar;
+RASmodel            laminar;
 
 turbulence      off;
 

tutorials/rasInterFoam/damBreak/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties

@@ -16,7 +16,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 turbulence      on;
 
 laminarCoeffs

tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties

@@ -16,7 +16,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 turbulence      on;
 
 laminarCoeffs

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;

tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H

@@ -41,9 +41,9 @@
 
 
     Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::turbulenceModel> turbulence
+    autoPtr<compressible::RASmodel> turbulence
     (
-        compressible::turbulenceModel::New
+        compressible::RASmodel::New
         (
             rho,
             U,

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"

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;

tutorials/settlingFoam/dahl/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/settlingFoam/tank3D/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kOmegaSST;
+RASmodel            kOmegaSST;
 
 turbulence      on;
 

tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H

@@ -46,9 +46,9 @@
 
     singlePhaseTransportModel laminarTransport(Urel, phi);
 
-    autoPtr<incompressible::turbulenceModel> turbulence
+    autoPtr<incompressible::RASmodel> turbulence
     (
-        incompressible::turbulenceModel::New(Urel, phi, laminarTransport)
+        incompressible::RASmodel::New(Urel, phi, laminarTransport)
     );
 
     Info<< "Creating SRF model\n" << endl;

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"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel LaunderSharmaKE;
+RASmodel            LaunderSharmaKE;
 
 turbulence      on;
 

tutorials/sonicTurbFoam/prism/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/turbFoam/cavity/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      on;
 

tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties

@@ -22,7 +22,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-turbulenceModel kEpsilon;
+RASmodel            kEpsilon;
 
 turbulence      off;