updated to reflect changes in turbulence models

applications/utilities/postProcessing/turbulence/R/Make/options

@@ -5,6 +5,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lincompressibleRASmodels \
+    -lincompressibleRASModels \
     -lincompressibleTransportModels \
     -lfiniteVolume

applications/utilities/postProcessing/turbulence/R/R.C

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    R 
+    R
 
 Description
     Calculates and writes the Reynolds stress R for the current time step.
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        turbulence->R()
+        RASModel->R()
     );
 
     R.write();

applications/utilities/postProcessing/turbulence/R/createFields.H

@@ -16,7 +16,7 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<incompressible::RASmodel> turbulence
+    autoPtr<incompressible::RASModel> RASModel
     (
-        incompressible::RASmodel::New(U, phi, laminarTransport)
+        incompressible::RASModel::New(U, phi, laminarTransport)
     );

applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options

@@ -5,5 +5,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lincompressibleRASmodels \
+    -lincompressibleRASModels \
     -lincompressibleTransportModels

applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H

@@ -16,7 +16,7 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<incompressible::RASmodel> turbulence
+    autoPtr<incompressible::RASModel> RASModel
     (
-        incompressible::RASmodel::New(U, phi, laminarTransport)
+        incompressible::RASModel::New(U, phi, laminarTransport)
     );

applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C

@@ -36,7 +36,7 @@ Source files:
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,13 +68,13 @@ int main(int argc, char *argv[])
         // Cache the turbulence fields
 
         Info<< "\nRetrieving field k from turbulence model" << endl;
-        const volScalarField k = turbulence->k();
+        const volScalarField k = RASModel->k();
 
         Info<< "\nRetrieving field epsilon from turbulence model" << endl;
-        const volScalarField epsilon = turbulence->epsilon();
+        const volScalarField epsilon = RASModel->epsilon();
 
         Info<< "\nRetrieving field R from turbulence model" << endl;
-        const volSymmTensorField R = turbulence->R();
+        const volSymmTensorField R = RASModel->R();
 
         // Check availability of tubulence fields
 

applications/utilities/postProcessing/wall/wallGradU/Make/options

 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
-    -I$(LIB_SRC)/transportModels
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleRASmodels \
-    -lincompressibleTransportModels \
     -lfiniteVolume

applications/utilities/postProcessing/wall/wallGradU/wallGradU.C

@@ -31,7 +31,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "incompressible/RASmodel/RASmodel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/utilities/postProcessing/wall/wallHeatFlux/Make/options

@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 EXE_LIBS = \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
     -lcombustionThermophysicalModels \
     -lfiniteVolume \
     -lspecie \

applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H

@@ -31,9 +31,9 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-autoPtr<compressible::RASmodel> turbulence
+autoPtr<compressible::RASModel> RASModel
 (
-    compressible::RASmodel::New
+    compressible::RASModel::New
     (
         rho,
         U,

applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C

@@ -34,7 +34,7 @@ Description
 
 #include "fvCFD.H"
 #include "hCombustionThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
 #       include "createFields.H"
 
         surfaceScalarField heatFlux =
-            fvc::interpolate(turbulence->alphaEff())*fvc::snGrad(h);
+            fvc::interpolate(RASModel->alphaEff())*fvc::snGrad(h);
 
         const surfaceScalarField::GeometricBoundaryField& patchHeatFlux =
             heatFlux.boundaryField();

applications/utilities/postProcessing/wall/wallShearStress/Make/options

@@ -4,6 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels
 
 EXE_LIBS = \
-    -lincompressibleRASmodels \
+    -lincompressibleRASModels \
     -lincompressibleTransportModels \
     -lfiniteVolume

applications/utilities/postProcessing/wall/wallShearStress/createFields.H

@@ -16,7 +16,7 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<incompressible::RASmodel> turbulence
+    autoPtr<incompressible::RASModel> RASModel
     (
-        incompressible::RASmodel::New(U, phi, laminarTransport)
+        incompressible::RASModel::New(U, phi, laminarTransport)
     );

applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 
 #       include "createFields.H"
 
-        volSymmTensorField Reff(turbulence->devReff());
+        volSymmTensorField Reff(RASModel->devReff());
 
         volVectorField wallShearStress
         (

applications/utilities/postProcessing/wall/yPlusLES/Make/options

@@ -5,6 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleLESmodels \
+    -lincompressibleLESModels \
     -lincompressibleTransportModels \
     -lfiniteVolume

applications/utilities/postProcessing/wall/yPlusLES/createFields.H

@@ -16,9 +16,9 @@ volVectorField U
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::LESmodel> sgsModel
+autoPtr<incompressible::LESModel> sgsModel
 (
-    incompressible::LESmodel::New(U, phi, laminarTransport)
+    incompressible::LESModel::New(U, phi, laminarTransport)
 );
 
 volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();

applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/LESmodel/LESmodel.H"
+#include "incompressible/LESModel/LESModel.H"
 #include "nearWallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -83,9 +83,9 @@ int main(int argc, char *argv[])
 
         singlePhaseTransportModel laminarTransport(U, phi);
 
-        autoPtr<incompressible::LESmodel> sgsModel
+        autoPtr<incompressible::LESModel> sgsModel
         (
-            incompressible::LESmodel::New(U, phi, laminarTransport)
+            incompressible::LESModel::New(U, phi, laminarTransport)
         );
 
         volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();

applications/utilities/postProcessing/wall/yPlusRAS/Make/options

@@ -4,6 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels
 
 EXE_LIBS = \
-    -lincompressibleRASmodels \
+    -lincompressibleRASModels \
     -lincompressibleTransportModels \
     -lfiniteVolume

applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
 #include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -83,9 +83,9 @@ int main(int argc, char *argv[])
 
         singlePhaseTransportModel laminarTransport(U, phi);
 
-        autoPtr<incompressible::RASmodel> turbulence
+        autoPtr<incompressible::RASModel> RASModel
         (
-            incompressible::RASmodel::New(U, phi, laminarTransport)
+            incompressible::RASModel::New(U, phi, laminarTransport)
         );
 
         const fvPatchList& patches = mesh.boundary();
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
 
             if (typeid(currPatch) == typeid(wallFvPatch))
             {
-                yPlus.boundaryField()[patchi] = turbulence->yPlus(patchi);
+                yPlus.boundaryField()[patchi] = RASModel->yPlus(patchi);
                 const scalarField& Yp = yPlus.boundaryField()[patchi];
 
                 Info<< "Patch " << patchi