consistency updates

2008-06-20 11:22:33 +01:00 · 2008-06-20 11:22:33 +01:00 · 71916c4416
commit 71916c4416
parent 41161387e4
314 changed files with 1519 additions and 1455 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 \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
    -lbasicThermophysicalModels \
    -lcombustionThermophysicalModels \
    -lspecie \
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@ -58,7 +58,7 @@ Description

 #include "fvCFD.H"
 #include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"
 #include "PDRDragModel.H"
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@ -59,7 +59,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"
 #include "PDRDragModel.H"
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
@ -45,7 +45,7 @@ Foam::XiEqModels::basicSubGrid::basicSubGrid
 (
    const dictionary& XiEqProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
@ -94,7 +94,7 @@ public:
        (
            const dictionary& XiEqProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
@ -45,7 +45,7 @@ Foam::XiGModels::basicSubGrid::basicSubGrid
 (
    const dictionary& XiGProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
@ -85,7 +85,7 @@ public:
        (
            const dictionary& XiGProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
@ -40,7 +40,7 @@ namespace Foam
 Foam::PDRDragModel::PDRDragModel
 (
    const dictionary& PDRProperties,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& rho,
    const volVectorField& U,
    const surfaceScalarField& phi
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
@ -38,7 +38,7 @@ SourceFiles

 #include "IOdictionary.H"
 #include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "multivariateSurfaceInterpolationScheme.H"
 #include "runTimeSelectionTables.H"

@ -62,7 +62,7 @@ protected:

        dictionary PDRDragModelCoeffs_;

-        const compressible::RASmodel& turbulence_;
+        const compressible::RASModel& turbulence_;
        const volScalarField& rho_;
        const volVectorField& U_;
        const surfaceScalarField& phi_;
@ -96,7 +96,7 @@ public:
            dictionary,
            (
                const dictionary& PDRProperties,
-                const compressible::RASmodel& turbulence,
+                const compressible::RASModel& turbulence,
                const volScalarField& rho,
                const volVectorField& U,
                const surfaceScalarField& phi
@ -117,7 +117,7 @@ public:
        static autoPtr<PDRDragModel> New
        (
            const dictionary& PDRProperties,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& rho,
            const volVectorField& U,
            const surfaceScalarField& phi
@ -130,7 +130,7 @@ public:
        PDRDragModel
        (
            const dictionary& PDRProperties,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& rho,
            const volVectorField& U,
            const surfaceScalarField& phi
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
@ -31,7 +31,7 @@ License
 Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
 (
    const dictionary& PDRProperties,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& rho,
    const volVectorField& U,
    const surfaceScalarField& phi
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
@ -44,7 +44,7 @@ namespace PDRDragModels
 Foam::PDRDragModels::basic::basic
 (
    const dictionary& PDRProperties,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& rho,
    const volVectorField& U,
    const surfaceScalarField& phi
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
@ -86,7 +86,7 @@ public:
        basic
        (
            const dictionary& PDRProperties,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& rho,
            const volVectorField& U,
            const surfaceScalarField& phi
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@ -35,13 +35,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {

 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

 defineTypeNameAndDebug(PDRkEpsilon, 0);
-addToRunTimeSelectionTable(RASmodel, PDRkEpsilon, dictionary);
+addToRunTimeSelectionTable(RASModel, PDRkEpsilon, dictionary);

 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

@ -53,17 +53,62 @@ PDRkEpsilon::PDRkEpsilon
    basicThermo& thermophysicalModel
 )
 :
-    RASmodel(typeName, rho, U, phi, thermophysicalModel),
+    RASModel(typeName, rho, U, phi, thermophysicalModel),

-    Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
-    C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
-    C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
-    alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
-    alphaEps
+    Cmu_
    (
-        RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cmu",
+            coeffDict_,
+            0.09
+        )
+    ),
+    C1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "C1",
+            coeffDict_,
+            1.44
+        )
+    ),
+    C2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "C2",
+            coeffDict_,
+            1.92
+        )
+    ),
+    alphak_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphak",
+            coeffDict_,
+            1.0
+        )
+    ),
+    alphaEps_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaEps",
+            coeffDict_,
+            0.76923
+        )
+    ),
+    alphah_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphah",
+            coeffDict_,
+            1.0
+        )
    ),
-    alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),

    k_
    (
@ -101,7 +146,7 @@ PDRkEpsilon::PDRkEpsilon
            IOobject::NO_READ,
            IOobject::NO_WRITE
        ),
-        Cmu*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
+        Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
    )
 {
 #   include "wallViscosityI.H"
@ -164,14 +209,14 @@ tmp<fvVectorMatrix> PDRkEpsilon::divDevRhoReff(volVectorField& U) const

 bool PDRkEpsilon::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
    {
-        RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
-        RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
-        RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
-        RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
-        RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
-        RASmodelCoeffs_.readIfPresent<scalar>("alphah", alphah);
+        Cmu_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        alphak_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
+        alphah_.readIfPresent(coeffDict_);

        return true;
    }
@ -187,12 +232,12 @@ void PDRkEpsilon::correct()
    if (!turbulence_)
    {
        // Re-calculate viscosity
-        mut_ = rho_*Cmu*sqr(k_)/(epsilon_ + epsilonSmall_);
+        mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
 #       include "wallViscosityI.H"
        return;
    }

-    RASmodel::correct();
+    RASModel::correct();

    volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));

@ -223,9 +268,9 @@ void PDRkEpsilon::correct()
      + fvm::div(phi_, epsilon_)
      - fvm::laplacian(DepsilonEff(), epsilon_)
     ==
-        C1*(betav*G + GR)*epsilon_/k_
-      - fvm::SuSp(((2.0/3.0)*C1)*betav*rho_*divU, epsilon_)
-      - fvm::Sp(C2*betav*rho_*epsilon_/k_, epsilon_)
+        C1_*(betav*G + GR)*epsilon_/k_
+      - fvm::SuSp(((2.0/3.0)*C1_)*betav*rho_*divU, epsilon_)
+      - fvm::Sp(C2_*betav*rho_*epsilon_/k_, epsilon_)
    );

 #   include "wallDissipationI.H"
@ -255,7 +300,7 @@ void PDRkEpsilon::correct()


    // Re-calculate viscosity
-    mut_ = rho_*Cmu*sqr(k_)/epsilon_;
+    mut_ = rho_*Cmu_*sqr(k_)/epsilon_;

 #   include "wallViscosityI.H"

@ -264,7 +309,7 @@ void PDRkEpsilon::correct()

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam

--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
@ -37,7 +37,7 @@ SourceFiles
 #ifndef compressiblePDRkEpsilon_H
 #define compressiblePDRkEpsilon_H

-#include "RASmodel.H"
+#include "RASModel.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

@ -45,7 +45,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {

 /*---------------------------------------------------------------------------*\
@ -54,16 +54,16 @@ namespace RAS

 class PDRkEpsilon
 :
-    public RASmodel
+    public RASModel
 {
    // Private data

-        scalar Cmu;
-        scalar C1;
-        scalar C2;
-        scalar alphak;
-        scalar alphaEps;
-        scalar alphah;
+        dimensionedScalar Cmu_;
+        dimensionedScalar C1_;
+        dimensionedScalar C2_;
+        dimensionedScalar alphak_;
+        dimensionedScalar alphaEps_;
+        dimensionedScalar alphah_;

        volScalarField k_;
        volScalarField epsilon_;
@ -105,7 +105,7 @@ public:
        {
            return tmp<volScalarField>
            (
-                new volScalarField("DkEff", alphak*mut_ + mu())
+                new volScalarField("DkEff", alphak_*mut_ + mu())
            );
        }

@ -114,7 +114,7 @@ public:
        {
            return tmp<volScalarField>
            (
-                new volScalarField("DepsilonEff", alphaEps*mut_ + mu())
+                new volScalarField("DepsilonEff", alphaEps_*mut_ + mu())
            );
        }

@ -123,7 +123,7 @@ public:
        {
            return tmp<volScalarField>
            (
-                new volScalarField("alphaEff", alphah*mut_ + alpha())
+                new volScalarField("alphaEff", alphah_*mut_ + alpha())
            );
        }

@ -158,7 +158,7 @@ public:

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam

--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
@ -45,7 +45,7 @@ Foam::XiEqModels::Gulder::Gulder
 (
    const dictionary& XiEqProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
@ -82,7 +82,7 @@ public:
        (
            const dictionary& XiEqProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
@ -45,7 +45,7 @@ Foam::XiEqModels::SCOPEBlend::SCOPEBlend
 (
    const dictionary& XiEqProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
@ -83,7 +83,7 @@ public:
        (
            const dictionary& XiEqProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
@ -45,7 +45,7 @@ Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq
 (
    const dictionary& XiEqProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
@ -90,7 +90,7 @@ public:
        (
            const dictionary& XiEqProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
@ -41,7 +41,7 @@ Foam::XiEqModel::XiEqModel
 (
    const dictionary& XiEqProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
@ -38,7 +38,7 @@ SourceFiles

 #include "IOdictionary.H"
 #include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "runTimeSelectionTables.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -60,7 +60,7 @@ protected:
        dictionary XiEqModelCoeffs_;

        const hhuCombustionThermo& thermo_;
-        const compressible::RASmodel& turbulence_;
+        const compressible::RASModel& turbulence_;
        const volScalarField& Su_;


@ -91,7 +91,7 @@ public:
            (
                const dictionary& XiEqProperties,
                const hhuCombustionThermo& thermo,
-                const compressible::RASmodel& turbulence,
+                const compressible::RASModel& turbulence,
                const volScalarField& Su
            ),
            (
@ -110,7 +110,7 @@ public:
        (
            const dictionary& XiEqProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

@ -122,7 +122,7 @@ public:
        (
            const dictionary& XiEqProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
@ -32,7 +32,7 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
 (
    const dictionary& XiEqProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 {
@ -50,7 +50,7 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
            "XiEqModel::New"
            "("
            "    const hhuCombustionThermo& thermo,"
-            "    const compressible::RASmodel& turbulence,"
+            "    const compressible::RASModel& turbulence,"
            "    const volScalarField& Su"
            ")"
        )   << "Unknown XiEqModel type "
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
@ -45,7 +45,7 @@ Foam::XiEqModels::instability::instability
 (
    const dictionary& XiEqProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
@ -83,7 +83,7 @@ public:
        (
            const dictionary& XiEqProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
@ -45,7 +45,7 @@ Foam::XiGModels::KTS::KTS
 (
    const dictionary& XiGProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
@ -80,7 +80,7 @@ public:
        (
            const dictionary& XiGProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C
@ -41,7 +41,7 @@ Foam::XiGModel::XiGModel
 (
    const dictionary& XiGProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
@ -38,7 +38,7 @@ SourceFiles

 #include "IOdictionary.H"
 #include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "runTimeSelectionTables.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -60,7 +60,7 @@ protected:
        dictionary XiGModelCoeffs_;

        const hhuCombustionThermo& thermo_;
-        const compressible::RASmodel& turbulence_;
+        const compressible::RASModel& turbulence_;
        const volScalarField& Su_;


@ -91,7 +91,7 @@ public:
            (
                const dictionary& XiGProperties,
                const hhuCombustionThermo& thermo,
-                const compressible::RASmodel& turbulence,
+                const compressible::RASModel& turbulence,
                const volScalarField& Su
            ),
            (
@ -110,7 +110,7 @@ public:
        (
            const dictionary& XiGProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

@ -122,7 +122,7 @@ public:
        (
            const dictionary& XiGProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
@ -32,7 +32,7 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
 (
    const dictionary& XiGProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 {
@ -50,7 +50,7 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
            "XiGModel::New"
            "("
            "    const hhuCombustionThermo& thermo,"
-            "    const compressible::RASmodel& turbulence,"
+            "    const compressible::RASModel& turbulence,"
            "    const volScalarField& Su"
            ")"
        )   << "Unknown XiGModel type "
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C
@ -45,7 +45,7 @@ Foam::XiGModels::instabilityG::instabilityG
 (
    const dictionary& XiGProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
@ -87,7 +87,7 @@ public:
        (
            const dictionary& XiGProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );

--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C
@ -41,7 +41,7 @@ Foam::XiModel::XiModel
 (
    const dictionary& XiProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su,
    const volScalarField& rho,
    const volScalarField& b,
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
@ -38,7 +38,7 @@ SourceFiles

 #include "IOdictionary.H"
 #include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "multivariateSurfaceInterpolationScheme.H"
 #include "runTimeSelectionTables.H"

@ -61,7 +61,7 @@ protected:
        dictionary XiModelCoeffs_;

        const hhuCombustionThermo& thermo_;
-        const compressible::RASmodel& turbulence_;
+        const compressible::RASModel& turbulence_;
        const volScalarField& Su_;
        const volScalarField& rho_;
        const volScalarField& b_;
@ -98,7 +98,7 @@ public:
            (
                const dictionary& XiProperties,
                const hhuCombustionThermo& thermo,
-                const compressible::RASmodel& turbulence,
+                const compressible::RASModel& turbulence,
                const volScalarField& Su,
                const volScalarField& rho,
                const volScalarField& b,
@ -123,7 +123,7 @@ public:
        (
            const dictionary& XiProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su,
            const volScalarField& rho,
            const volScalarField& b,
@ -138,7 +138,7 @@ public:
        (
            const dictionary& XiProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su,
            const volScalarField& rho,
            const volScalarField& b,
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
@ -32,7 +32,7 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
 (
    const dictionary& XiProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su,
    const volScalarField& rho,
    const volScalarField& b,
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
@ -45,7 +45,7 @@ Foam::XiModels::algebraic::algebraic
 (
    const dictionary& XiProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su,
    const volScalarField& rho,
    const volScalarField& b,
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
@ -86,7 +86,7 @@ public:
        (
            const dictionary& XiProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su,
            const volScalarField& rho,
            const volScalarField& b,
--- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.C
@ -45,7 +45,7 @@ Foam::XiModels::fixed::fixed
 (
    const dictionary& XiProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su,
    const volScalarField& rho,
    const volScalarField& b,
--- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
@ -75,7 +75,7 @@ public:
        (
            const dictionary& XiProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su,
            const volScalarField& rho,
            const volScalarField& b,
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
@ -45,7 +45,7 @@ Foam::XiModels::transport::transport
 (
    const dictionary& XiProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su,
    const volScalarField& rho,
    const volScalarField& b,
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
@ -86,7 +86,7 @@ public:
        (
            const dictionary& XiProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su,
            const volScalarField& rho,
            const volScalarField& b,
--- a/applications/solvers/combustion/PDRFoam/createFields.H
+++ b/applications/solvers/combustion/PDRFoam/createFields.H
@ -47,9 +47,9 @@
 #   include "compressibleCreatePhi.H"

    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@ -12,7 +12,7 @@ EXE_LIBS = \
    -lengine \
    -lfiniteVolume \
    -lmeshTools \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
    -lbasicThermophysicalModels \
    -lcombustionThermophysicalModels \
    -lspecie \
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@ -52,7 +52,7 @@ Description

 #include "fvCFD.H"
 #include "hhuCombustionThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
 #include "Switch.H"
--- a/applications/solvers/combustion/XiFoam/createFields.H
+++ b/applications/solvers/combustion/XiFoam/createFields.H
@ -48,9 +48,9 @@


    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/combustion/Xoodles/Make/options
+++ b/applications/solvers/combustion/Xoodles/Make/options
@ -19,5 +19,5 @@ EXE_LIBS = \
    -lbasicThermophysicalModels \
    -lcombustionThermophysicalModels \
    -lspecie \
-    -lcompressibleLESmodels \
+    -lcompressibleLESModels \
    -llaminarFlameSpeedModels
--- a/applications/solvers/combustion/Xoodles/Xoodles.C
+++ b/applications/solvers/combustion/Xoodles/Xoodles.C
@ -52,7 +52,7 @@ Description

 #include "fvCFD.H"
 #include "hhuCombustionThermo.H"
-#include "compressible/LESmodel/LESmodel.H"
+#include "compressible/LESModel/LESModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
 #include "IFstream.H"
--- a/applications/solvers/combustion/Xoodles/createFields.H
+++ b/applications/solvers/combustion/Xoodles/createFields.H
@ -48,9 +48,9 @@


    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::LESmodel> turbulence
+    autoPtr<compressible::LESModel> turbulence
    (
-        compressible::LESmodel::New(rho, U, phi, thermo())
+        compressible::LESModel::New(rho, U, phi, thermo())
    );


--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@ -11,6 +11,6 @@ EXE_INC = \
 EXE_LIBS = \
    -lengine \
    -lfiniteVolume \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
    -lbasicThermophysicalModels \
    -lspecie
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@ -34,7 +34,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "basicThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "OFstream.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/applications/solvers/combustion/coldEngineFoam/createFields.H
+++ b/applications/solvers/combustion/coldEngineFoam/createFields.H
@ -42,9 +42,9 @@


    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/combustion/dieselEngineFoam/Make/options
+++ b/applications/solvers/combustion/dieselEngineFoam/Make/options
@ -18,7 +18,7 @@ EXE_INC = \

 EXE_LIBS = \
    -lengine \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
    -lcombustionThermophysicalModels \
    -lfiniteVolume \
    -llagrangian \
--- a/applications/solvers/combustion/dieselEngineFoam/createFields.H
+++ b/applications/solvers/combustion/dieselEngineFoam/createFields.H
@ -58,9 +58,9 @@ volScalarField kappa
 );

 Info << "Creating turbulence model.\n" << nl;
-autoPtr<compressible::RASmodel> turbulence
+autoPtr<compressible::RASModel> turbulence
 (
-    compressible::RASmodel::New
+    compressible::RASModel::New
    (
        rho,
        U,
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@ -34,7 +34,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "hCombustionThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "spray.H"
 #include "chemistryModel.H"
 #include "chemistrySolver.H"
--- 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 = \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
    -lcombustionThermophysicalModels \
    -lfiniteVolume \
    -llagrangian \
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@ -32,7 +32,7 @@ Description

 #include "fvCFD.H"
 #include "hCombustionThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "spray.H"
 #include "chemistryModel.H"
 #include "chemistrySolver.H"
--- a/applications/solvers/combustion/engineFoam/Make/options
+++ b/applications/solvers/combustion/engineFoam/Make/options
@ -11,7 +11,7 @@ EXE_INC = \
 EXE_LIBS = \
    -lengine \
    -lfiniteVolume \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
    -lbasicThermophysicalModels \
    -lcombustionThermophysicalModels \
    -lspecie \
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@ -53,7 +53,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
 #include "Switch.H"
--- 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 = \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
    -lcombustionThermophysicalModels \
    -lfiniteVolume \
    -lspecie \
--- a/applications/solvers/combustion/reactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/createFields.H
@ -58,9 +58,9 @@ volScalarField kappa
 );

 Info << "Creating turbulence model.\n" << nl;
-autoPtr<compressible::RASmodel> turbulence
+autoPtr<compressible::RASModel> turbulence
 (
-    compressible::RASmodel::New
+    compressible::RASModel::New
    (
        rho,
        U,
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@ -32,7 +32,7 @@ Description

 #include "fvCFD.H"
 #include "hCombustionThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "chemistryModel.H"
 #include "chemistrySolver.H"
 #include "multivariateScheme.H"
--- a/applications/solvers/compressible/coodles/Make/options
+++ b/applications/solvers/compressible/coodles/Make/options
@ -10,4 +10,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleLESmodels
+    -lcompressibleLESModels
--- a/applications/solvers/compressible/coodles/coodles.C
+++ b/applications/solvers/compressible/coodles/coodles.C
@ -32,7 +32,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/LESmodel/LESmodel.H"
+#include "compressible/LESModel/LESModel.H"

 #define divDevRhoReff divDevRhoBeff

--- a/applications/solvers/compressible/coodles/createFields.H
+++ b/applications/solvers/compressible/coodles/createFields.H
@ -40,9 +40,9 @@


    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::LESmodel> turbulence
+    autoPtr<compressible::LESModel> turbulence
    (
-        compressible::LESmodel::New(rho, U, phi, thermo())
+        compressible::LESModel::New(rho, U, phi, thermo())
    );

    Info<< "Creating field DpDt\n" << endl;
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@ -9,4 +9,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleRASmodels
+    -lcompressibleRASModels
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@ -44,9 +44,9 @@
    );

    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@ -36,7 +36,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "fixedGradientFvPatchFields.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
@ -10,4 +10,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleRASmodels
+    -lcompressibleRASModels
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
@ -49,9 +49,9 @@
    );

    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@ -33,7 +33,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "porousZones.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@ -9,4 +9,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleRASmodels
+    -lcompressibleRASModels
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@ -49,9 +49,9 @@
    );

    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@ -33,7 +33,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "fixedGradientFvPatchFields.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/applications/solvers/compressible/rhoTurbFoam/Make/options
+++ b/applications/solvers/compressible/rhoTurbFoam/Make/options
@ -9,4 +9,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleRASmodels
+    -lcompressibleRASModels
--- a/applications/solvers/compressible/rhoTurbFoam/createFields.H
+++ b/applications/solvers/compressible/rhoTurbFoam/createFields.H
@ -40,9 +40,9 @@


    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/compressible/rhoTurbFoam/rhoTurbFoam.C
+++ b/applications/solvers/compressible/rhoTurbFoam/rhoTurbFoam.C
@ -32,7 +32,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/compressible/sonicTurbFoam/Make/options
+++ b/applications/solvers/compressible/sonicTurbFoam/Make/options
@ -7,6 +7,6 @@ EXE_INC = \
 EXE_LIBS = \
    -lfiniteVolume \
    -lmeshTools \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
    -lbasicThermophysicalModels \
    -lspecie
--- a/applications/solvers/compressible/sonicTurbFoam/createFields.H
+++ b/applications/solvers/compressible/sonicTurbFoam/createFields.H
@ -38,9 +38,9 @@


    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/compressible/sonicTurbFoam/sonicTurbFoam.C
+++ b/applications/solvers/compressible/sonicTurbFoam/sonicTurbFoam.C
@ -33,7 +33,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/heatTransfer/buoyantFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantFoam/Make/options
@ -9,4 +9,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleRASmodels
+    -lcompressibleRASModels
--- a/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C
+++ b/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C
@ -34,7 +34,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "fixedGradientFvPatchFields.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/applications/solvers/heatTransfer/buoyantFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantFoam/createFields.H
@ -41,9 +41,9 @@


    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@ -9,4 +9,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleRASmodels
+    -lcompressibleRASModels
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@ -33,7 +33,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "fixedGradientFvPatchFields.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@ -40,9 +40,9 @@


    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
@ -11,4 +11,4 @@ EXE_LIBS = \
    -lbasicThermophysicalModels \
    -lspecie \
    -lradiation \
-    -lcompressibleRASmodels
+    -lcompressibleRASModels
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@ -33,7 +33,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "radiationModel.H"

--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H
@ -41,9 +41,9 @@


    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASmodel> turbulence
+    autoPtr<compressible::RASModel> turbulence
    (
-        compressible::RASmodel::New
+        compressible::RASModel::New
        (
            rho,
            U,
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@ -13,4 +13,4 @@ EXE_LIBS = \
    -lfiniteVolume \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleRASmodels
+    -lcompressibleRASModels
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@ -33,7 +33,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "regionProperties.H"

--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@ -4,7 +4,7 @@
    PtrList<volScalarField> Kf(fluidRegions.size());
    PtrList<volVectorField> Uf(fluidRegions.size());
    PtrList<surfaceScalarField> phif(fluidRegions.size());
-    PtrList<compressible::RASmodel> turb(fluidRegions.size());
+    PtrList<compressible::RASModel> turb(fluidRegions.size());
    PtrList<volScalarField> DpDtf(fluidRegions.size());
    PtrList<volScalarField> ghf(fluidRegions.size());
    PtrList<volScalarField> pdf(fluidRegions.size());
@ -125,9 +125,9 @@
        turb.set
        (
            i,
-            autoPtr<compressible::RASmodel>
+            autoPtr<compressible::RASModel>
            (
-                compressible::RASmodel::New
+                compressible::RASModel::New
                (
                    rhof[i],
                    Uf[i],
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveEnthalpyEquation.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveEnthalpyEquation.C
@ -32,7 +32,7 @@ void solveEnthalpyEquation
    const volScalarField& rho,
    const volScalarField& DpDt,
    const surfaceScalarField& phi,
-    const compressible::RASmodel& turb,
+    const compressible::RASModel& turb,
    basicThermo& thermo
 )
 {
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveMomentumEquation.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveMomentumEquation.C
@ -35,7 +35,7 @@ tmp<fvVectorMatrix> solveMomentumEquation
    const surfaceScalarField& phi,
    const volScalarField& pd,
    const volScalarField& gh,
-    const compressible::RASmodel& turb
+    const compressible::RASModel& turb
 )
 {
    // Solve the Momentum equation
--- a/applications/solvers/heatTransfer/lesBuoyantFoam/Make/options
+++ b/applications/solvers/heatTransfer/lesBuoyantFoam/Make/options
@ -10,4 +10,4 @@ EXE_LIBS = \
    -lmeshTools \
    -lbasicThermophysicalModels \
    -lspecie \
-    -lcompressibleLESmodels
+    -lcompressibleLESModels
--- a/applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H
+++ b/applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H
@ -41,9 +41,9 @@


    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::LESmodel> turbulence
+    autoPtr<compressible::LESModel> turbulence
    (
-        compressible::LESmodel::New(rho, U, phi, thermo())
+        compressible::LESModel::New(rho, U, phi, thermo())
    );


--- a/applications/solvers/heatTransfer/lesBuoyantFoam/lesBuoyantFoam.C
+++ b/applications/solvers/heatTransfer/lesBuoyantFoam/lesBuoyantFoam.C
@ -34,7 +34,7 @@ Description

 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/LESmodel/LESmodel.H"
+#include "compressible/LESModel/LESModel.H"

 #define divDevRhoReff divDevRhoBeff

--- 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 = \
-    -lincompressibleRASmodels \
+    -lincompressibleRASModels \
    -lincompressibleTransportModels \
    -lfiniteVolume \
    -lmeshTools \
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@ -38,7 +38,7 @@ Description

 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
 #include "wallFvPatch.H"
 #include "makeGraph.H"

--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@ -31,9 +31,9 @@

    singlePhaseTransportModel laminarTransport(U, phi);

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


--- a/applications/solvers/incompressible/channelOodles/Make/options
+++ b/applications/solvers/incompressible/channelOodles/Make/options
@ -7,7 +7,7 @@ EXE_INC = \
    -I../oodles

 EXE_LIBS = \
-    -lincompressibleLESmodels \
+    -lincompressibleLESModels \
    -lincompressibleTransportModels \
    -lfiniteVolume \
    -lmeshTools
--- a/Show More
+++ b/Show More