consistency updates

src/finiteVolume/fields/fvPatchFields/derived/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C

@@ -105,17 +105,17 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
     }
 
     // Lookup Cmu corresponding to the turbulence model selected
-    const dictionary& turbulenceProperties = db().lookupObject<IOdictionary>
+    const dictionary& RASProperties = db().lookupObject<IOdictionary>
     (
-        "turbulenceProperties"
+        "RASProperties"
     );
 
-    const dictionary& turbulenceCoeffs = turbulenceProperties.subDict
+    const dictionary& RASCoeffs = RASProperties.subDict
     (
-        word(turbulenceProperties.lookup("RASmodel")) + "Coeffs"
+        word(RASProperties.lookup("RASModel")) + "Coeffs"
     );
 
-    scalar Cmu = readScalar(turbulenceCoeffs.lookup("Cmu"));
+    scalar Cmu = readScalar(RASCoeffs.lookup("Cmu"));
     scalar Cmu75 = pow(Cmu, 0.75);
 
     const fvPatchField<scalar>& k =

src/finiteVolume/fields/fvPatchFields/derived/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C

@@ -110,17 +110,17 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
     }
 
     // Lookup Cmu corresponding to the turbulence model selected
-    const dictionary& turbulenceProperties = db().lookupObject<IOdictionary>
+    const dictionary& RASProperties = db().lookupObject<IOdictionary>
     (
-        "turbulenceProperties"
+        "RASProperties"
     );
 
-    const dictionary& turbulenceCoeffs = turbulenceProperties.subDict
+    const dictionary& RASCoeffs = RASProperties.subDict
     (
-        word(turbulenceProperties.lookup("RASmodel")) + "Coeffs"
+        word(RASProperties.lookup("RASModel")) + "Coeffs"
     );
 
-    scalar Cmu = readScalar(turbulenceCoeffs.lookup("Cmu"));
+    scalar Cmu = readScalar(RASCoeffs.lookup("Cmu"));
     scalar Cmu25 = pow(Cmu, 0.25);
 
     const fvPatchField<scalar>& kp =

src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(DeardorffDiffStress, 0);
-addToRunTimeSelectionTable(LESmodel, DeardorffDiffStress, dictionary);
+addToRunTimeSelectionTable(LESModel, DeardorffDiffStress, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -52,7 +52,7 @@ DeardorffDiffStress::DeardorffDiffStress
     const basicThermo& thermoPhysicalModel
 )
 :
-    LESmodel(typeName, rho, U, phi, thermoPhysicalModel),
+    LESModel(typeName, rho, U, phi, thermoPhysicalModel),
     GenSGSStress(rho, U, phi, thermoPhysicalModel),
 
     ck_
@@ -60,7 +60,7 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            LESmodelProperties(),
+            coeffDict(),
             0.094
         )
     ),
@@ -69,7 +69,7 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cm",
-            LESmodelProperties(),
+            coeffDict(),
             4.13
         )
     )
@@ -129,8 +129,8 @@ bool DeardorffDiffStress::read()
 {
     if (GenSGSStress::read())
     {
-        ck_.readIfPresent(LESmodelProperties());
-        cm_.readIfPresent(LESmodelProperties());
+        ck_.readIfPresent(coeffDict());
+        cm_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -143,7 +143,7 @@ bool DeardorffDiffStress::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::LESmodels::DeardorffDiffStress
+    Foam::compressible::LESModels::DeardorffDiffStress
 
 Description
     Differential SGS Stress Equation Model for compressible flows
@@ -62,7 +62,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -130,7 +130,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.C

@@ -32,7 +32,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -46,7 +46,7 @@ GenEddyVisc::GenEddyVisc
     const basicThermo& thermoPhysicalModel
 )
 :
-    LESmodel
+    LESModel
     (
         word("GenEddyVisc"), rho, U, phi, thermoPhysicalModel
     ),
@@ -56,7 +56,7 @@ GenEddyVisc::GenEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            LESmodelProperties(),
+            coeffDict(),
             1.048
         )
     ),
@@ -116,15 +116,15 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevRhoBeff(volVectorField& U) const
 
 void GenEddyVisc::correct(const tmp<volTensorField>& gradU)
 {
-    LESmodel::correct(gradU);
+    LESModel::correct(gradU);
 }
 
 
 bool GenEddyVisc::read()
 {
-    if (LESmodel::read())
+    if (LESModel::read())
     {
-        ce_.readIfPresent(LESmodelProperties());
+        ce_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -137,7 +137,7 @@ bool GenEddyVisc::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::LESmodels::GenEddyVisc
+    Foam::compressible::LESModels::GenEddyVisc
 
 Description
     General base class for all compressible models that can be implemented as
@@ -40,7 +40,7 @@ SourceFiles
 #ifndef compressibleGenEddyVisc_H
 #define compressibleGenEddyVisc_H
 
-#include "LESmodel.H"
+#include "LESModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,7 +48,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -57,7 +57,7 @@ namespace LES
 
 class GenEddyVisc
 :
-    virtual public LESmodel
+    virtual public LESModel
 {
     // Private Member Functions
 
@@ -144,7 +144,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.C

@@ -32,7 +32,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -46,7 +46,7 @@ GenSGSStress::GenSGSStress
     const basicThermo& thermoPhysicalModel
 )
 :
-    LESmodel
+    LESModel
     (
         word("GenSGSStress"),
         rho,
@@ -60,7 +60,7 @@ GenSGSStress::GenSGSStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            LESmodelProperties(),
+            coeffDict(),
             1.048
         )
     ),
@@ -131,15 +131,15 @@ tmp<fvVectorMatrix> GenSGSStress::divDevRhoBeff(volVectorField& U) const
 
 void GenSGSStress::correct(const tmp<volTensorField>& gradU)
 {
-    LESmodel::correct(gradU);
+    LESModel::correct(gradU);
 }
 
 
 bool GenSGSStress::read()
 {
-    if (LESmodel::read())
+    if (LESModel::read())
     {
-        ce_.readIfPresent(LESmodelProperties());
+        ce_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -152,7 +152,7 @@ bool GenSGSStress::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::LESmodels::GenSGSStress
+    Foam::compressible::LESModels::GenSGSStress
 
 Description
     General base class for all compressible models that directly
@@ -41,7 +41,7 @@ SourceFiles
 #ifndef compressibleGenSGSStress_H
 #define compressibleGenSGSStress_H
 
-#include "LESmodel.H"
+#include "LESModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,7 +49,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -58,7 +58,7 @@ namespace LES
 
 class GenSGSStress
 :
-    virtual public LESmodel
+    virtual public LESModel
 {
     // Private Member Functions
 
@@ -149,7 +149,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/LESModel/LESModel.C

@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "LESmodel.H"
+#include "LESModel.H"
 #include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -36,23 +36,23 @@ namespace compressible
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(LESmodel, 0);
-defineRunTimeSelectionTable(LESmodel, dictionary);
+defineTypeNameAndDebug(LESModel, 0);
+defineRunTimeSelectionTable(LESModel, dictionary);
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
-void LESmodel::printCoeffs()
+void LESModel::printCoeffs()
 {
     if (printCoeffs_)
     {
-        Info<< type() << "Coeffs" << LESmodelProperties_ << endl;
+        Info<< type() << "Coeffs" << coeffDict_ << endl;
     }
 }
 
 
 // * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * * //
 
-LESmodel::LESmodel
+LESModel::LESModel
 (
     const word& type,
     const volScalarField& rho,
@@ -65,7 +65,7 @@ LESmodel::LESmodel
     (
         IOobject
         (
-            "turbulenceProperties",
+            "LESProperties",
             U.time().constant(),
             U.db(),
             IOobject::MUST_READ,
@@ -82,7 +82,7 @@ LESmodel::LESmodel
     thermoPhysicalModel_(thermoPhysicalModel),
 
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    LESmodelProperties_(subDict(type + "Coeffs")),
+    coeffDict_(subDict(type + "Coeffs")),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
 
@@ -97,23 +97,23 @@ LESmodel::LESmodel
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void LESmodel::correct(const tmp<volTensorField>&)
+void LESModel::correct(const tmp<volTensorField>&)
 {
     delta_().correct();
 }
 
 
-void LESmodel::correct()
+void LESModel::correct()
 {
     correct(fvc::grad(U_));
 }
 
 
-bool LESmodel::read()
+bool LESModel::read()
 {
     if (regIOobject::read())
     {
-        LESmodelProperties_ = subDict(type() + "Coeffs");
+        coeffDict_ = subDict(type() + "Coeffs");
 
         delta_().read(*this);
 

src/turbulenceModels/LES/compressible/LESModel/LESModel.H

@@ -30,7 +30,7 @@ Description
 
 
 Class
-    Foam::compressible::LESmodel
+    Foam::compressible::LESModel
 
 Description
     Class for all compressible flow LES SGS models.
@@ -42,13 +42,13 @@ Description
     which contains the model selection and model coefficients.
 
 SourceFiles
-    LESmodel.C
-    newLESmodel.C
+    LESModel.C
+    newLESModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleLESmodel_H
-#define compressibleLESmodel_H
+#ifndef compressibleLESModel_H
+#define compressibleLESModel_H
 
 #include "LESdelta.H"
 #include "fvm.H"
@@ -67,10 +67,10 @@ namespace compressible
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class LESmodel Declaration
+                           Class LESModel Declaration
 \*---------------------------------------------------------------------------*/
 
-class LESmodel
+class LESModel
 :
     public IOdictionary
 {
@@ -94,7 +94,7 @@ private:
         const basicThermo& thermoPhysicalModel_;
 
         Switch printCoeffs_;
-        dictionary LESmodelProperties_;
+        dictionary coeffDict_;
 
         dimensionedScalar k0_;
 
@@ -104,8 +104,8 @@ private:
     // Private Member Functions
 
         // Disallow default bitwise copy construct and assignment
-        LESmodel(const LESmodel&);
-        LESmodel& operator=(const LESmodel&);
+        LESModel(const LESModel&);
+        LESModel& operator=(const LESModel&);
 
 
 protected:
@@ -119,7 +119,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("LESmodel");
+    TypeName("LESModel");
 
 
     // Declare run-time constructor selection table
@@ -127,7 +127,7 @@ public:
         declareRunTimeSelectionTable
         (
             autoPtr,
-            LESmodel,
+            LESModel,
             dictionary,
             (
                 const volScalarField& rho,
@@ -142,7 +142,7 @@ public:
     // Constructors
 
         //- Construct from components
-        LESmodel
+        LESModel
         (
             const word& type,
             const volScalarField& rho,
@@ -155,7 +155,7 @@ public:
     // Selectors
 
         //- Return a reference to the selected LES model
-        static autoPtr<LESmodel> New
+        static autoPtr<LESModel> New
         (
             const volScalarField& rho,
             const volVectorField& U,
@@ -166,7 +166,7 @@ public:
 
     // Destructor
 
-        virtual ~LESmodel()
+        virtual ~LESModel()
         {}
 
 
@@ -200,9 +200,9 @@ public:
 
             //- Access the dictionary which provides info. about choice of
             //  models, and all related data (particularly model coefficients).
-            inline dictionary& LESmodelProperties()
+            inline dictionary& coeffDict()
             {
-                return LESmodelProperties_;
+                return coeffDict_;
             }
 
             //- Access function to filter width

src/turbulenceModels/LES/compressible/LESModel/newLESModel.C

@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "LESmodel.H"
+#include "LESModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -35,7 +35,7 @@ namespace compressible
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-autoPtr<LESmodel> LESmodel::New
+autoPtr<LESModel> LESModel::New
 (
     const volScalarField& rho,
     const volVectorField& U,
@@ -43,7 +43,7 @@ autoPtr<LESmodel> LESmodel::New
     const basicThermo& thermoPhysicalModel
 )
 {
-    word LESmodelTypeName;
+    word LESModelTypeName;
 
     // Enclose the creation of the turbulencePropertiesDict to ensure it is
     // deleted before the turbulenceModel is created otherwise the dictionary
@@ -53,7 +53,7 @@ autoPtr<LESmodel> LESmodel::New
         (
             IOobject
             (
-                "turbulenceProperties",
+                "LESProperties",
                 U.time().constant(),
                 U.db(),
                 IOobject::MUST_READ,
@@ -61,28 +61,28 @@ autoPtr<LESmodel> LESmodel::New
             )
         );
 
-        turbulencePropertiesDict.lookup("LESmodel") >> LESmodelTypeName;
+        turbulencePropertiesDict.lookup("LESModel") >> LESModelTypeName;
     }
 
-    Info<< "Selecting turbulence model " << LESmodelTypeName << endl;
+    Info<< "Selecting LES turbulence model " << LESModelTypeName << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(LESmodelTypeName);
+        dictionaryConstructorTablePtr_->find(LESModelTypeName);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "LESmodel::New(const volVectorField& U, const "
+            "LESModel::New(const volVectorField& U, const "
             "surfaceScalarField& phi, const basicThermo&)"
-        )   << "Unknown LESmodel type " << LESmodelTypeName
+        )   << "Unknown LESModel type " << LESModelTypeName
             << endl << endl
-            << "Valid LESmodel types are :" << endl
+            << "Valid LESModel types are :" << endl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
     }
 
-    return autoPtr<LESmodel>(cstrIter()(rho, U, phi, thermoPhysicalModel));
+    return autoPtr<LESModel>(cstrIter()(rho, U, phi, thermoPhysicalModel));
 }
 
 

src/turbulenceModels/LES/compressible/Make/files

@@ -1,7 +1,7 @@
 wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
 
-LESmodel/LESmodel.C
-LESmodel/newLESmodel.C
+LESModel/LESModel.C
+LESModel/newLESModel.C
 GenEddyVisc/GenEddyVisc.C
 GenSGSStress/GenSGSStress.C
 
@@ -12,4 +12,4 @@ dynOneEqEddy/dynOneEqEddy.C
 DeardorffDiffStress/DeardorffDiffStress.C
 SpalartAllmaras/SpalartAllmaras.C
 
-LIB = $(FOAM_LIBBIN)/libcompressibleLESmodels
+LIB = $(FOAM_LIBBIN)/libcompressibleLESModels

src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(Smagorinsky, 0);
-addToRunTimeSelectionTable(LESmodel, Smagorinsky, dictionary);
+addToRunTimeSelectionTable(LESModel, Smagorinsky, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -52,7 +52,7 @@ Smagorinsky::Smagorinsky
     const basicThermo& thermoPhysicalModel
 )
 :
-    LESmodel(typeName, rho, U, phi, thermoPhysicalModel),
+    LESModel(typeName, rho, U, phi, thermoPhysicalModel),
     GenEddyVisc(rho, U, phi, thermoPhysicalModel),
 
     ck_
@@ -60,7 +60,7 @@ Smagorinsky::Smagorinsky
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            LESmodelProperties(),
+            coeffDict(),
             0.02
         )
     )
@@ -92,7 +92,7 @@ bool Smagorinsky::read()
 {
     if (GenEddyVisc::read())
     {
-        ck_.readIfPresent(LESmodelProperties());
+        ck_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -105,7 +105,7 @@ bool Smagorinsky::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::LESmodels::Smagorinsky
+    Foam::compressible::LESModels::Smagorinsky
 
 Description
     The choric Smagorinsky Model for compressible flows.
@@ -58,7 +58,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -116,7 +116,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(SpalartAllmaras, 0);
-addToRunTimeSelectionTable(LESmodel, SpalartAllmaras, dictionary);
+addToRunTimeSelectionTable(LESModel, SpalartAllmaras, dictionary);
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
@@ -102,14 +102,14 @@ SpalartAllmaras::SpalartAllmaras
     const basicThermo& thermoPhysicalModel
 )
 :
-    LESmodel(typeName, rho, U, phi, thermoPhysicalModel),
+    LESModel(typeName, rho, U, phi, thermoPhysicalModel),
 
     alphaNut_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaNut",
-            LESmodelProperties(),
+            coeffDict(),
             1.5
         )
     ),
@@ -119,7 +119,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb1",
-            LESmodelProperties(),
+            coeffDict(),
             0.1355
         )
     ),
@@ -128,7 +128,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb2",
-            LESmodelProperties(),
+            coeffDict(),
             0.622
         )
     ),
@@ -137,7 +137,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv1",
-            LESmodelProperties(),
+            coeffDict(),
             7.1
         )
     ),
@@ -146,7 +146,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv2",
-            LESmodelProperties(),
+            coeffDict(),
             5.0
         )
     ),
@@ -155,7 +155,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "CDES",
-            LESmodelProperties(),
+            coeffDict(),
             0.65
         )
     ),
@@ -164,7 +164,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            LESmodelProperties(),
+            coeffDict(),
             0.07
         )
     ),
@@ -183,7 +183,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw2",
-            LESmodelProperties(),
+            coeffDict(),
             0.3
         )
     ),
@@ -192,7 +192,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw3",
-            LESmodelProperties(),
+            coeffDict(),
             2.0
         )
     ),
@@ -261,7 +261,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoBeff(volVectorField& U) const
 void SpalartAllmaras::correct(const tmp<volTensorField>& tgradU)
 {
     const volTensorField& gradU = tgradU();
-    LESmodel::correct(gradU);
+    LESModel::correct(gradU);
 
     if (mesh_.changing())
     {
@@ -297,18 +297,18 @@ void SpalartAllmaras::correct(const tmp<volTensorField>& tgradU)
 
 bool SpalartAllmaras::read()
 {
-    if (LESmodel::read())
+    if (LESModel::read())
     {
-        alphaNut_.readIfPresent(LESmodelProperties());
-        Cb1_.readIfPresent(LESmodelProperties());
-        Cb2_.readIfPresent(LESmodelProperties());
+        alphaNut_.readIfPresent(coeffDict());
+        Cb1_.readIfPresent(coeffDict());
+        Cb2_.readIfPresent(coeffDict());
         Cw1_ = Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_);
-        Cw2_.readIfPresent(LESmodelProperties());
-        Cw3_.readIfPresent(LESmodelProperties());
-        Cv1_.readIfPresent(LESmodelProperties());
-        Cv2_.readIfPresent(LESmodelProperties());
-        CDES_.readIfPresent(LESmodelProperties());
-        ck_.readIfPresent(LESmodelProperties());
+        Cw2_.readIfPresent(coeffDict());
+        Cw3_.readIfPresent(coeffDict());
+        Cv1_.readIfPresent(coeffDict());
+        Cv2_.readIfPresent(coeffDict());
+        CDES_.readIfPresent(coeffDict());
+        ck_.readIfPresent(coeffDict());
         kappa_.readIfPresent(*this);
 
         return true;
@@ -322,7 +322,7 @@ bool SpalartAllmaras::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::LESmodels::SpalartAllmaras
+    Foam::compressible::LESModels::SpalartAllmaras
 
 Description
     SpalartAllmaras for compressible flows
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef compressibleSpalartAllmaras_H
 #define compressibleSpalartAllmaras_H
 
-#include "LESmodel.H"
+#include "LESModel.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,7 +45,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -54,7 +54,7 @@ namespace LES
 
 class SpalartAllmaras
 :
-    public LESmodel
+    public LESModel
 {
     // Private data
 
@@ -164,7 +164,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(dynOneEqEddy, 0);
-addToRunTimeSelectionTable(LESmodel, dynOneEqEddy, dictionary);
+addToRunTimeSelectionTable(LESModel, dynOneEqEddy, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -85,10 +85,10 @@ dynOneEqEddy::dynOneEqEddy
     const basicThermo& thermoPhysicalModel
 )
 :
-    LESmodel(typeName, rho, U, phi, thermoPhysicalModel),
+    LESModel(typeName, rho, U, phi, thermoPhysicalModel),
     GenEddyVisc(rho, U, phi, thermoPhysicalModel),
 
-    filterPtr_(LESfilter::New(U.mesh(), LESmodelProperties())),
+    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
     filter_(filterPtr_())
 {
     printCoeffs();
@@ -135,7 +135,7 @@ bool dynOneEqEddy::read()
 {
     if (GenEddyVisc::read())
     {
-        filter_.read(LESmodelProperties());
+        filter_.read(coeffDict());
 
         return true;
     }
@@ -148,7 +148,7 @@ bool dynOneEqEddy::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::LESmodels::dynOneEqEddy
+    Foam::compressible::LESModels::dynOneEqEddy
 
 Description
     One Equation Eddy Viscosity Model for compressible flows.
@@ -63,7 +63,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -135,7 +135,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(lowReOneEqEddy, 0);
-addToRunTimeSelectionTable(LESmodel, lowReOneEqEddy, dictionary);
+addToRunTimeSelectionTable(LESModel, lowReOneEqEddy, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -52,7 +52,7 @@ lowReOneEqEddy::lowReOneEqEddy
     const basicThermo& thermoPhysicalModel
 )
 :
-    LESmodel(typeName, rho, U, phi, thermoPhysicalModel),
+    LESModel(typeName, rho, U, phi, thermoPhysicalModel),
     GenEddyVisc(rho, U, phi, thermoPhysicalModel),
 
     ck_
@@ -60,7 +60,7 @@ lowReOneEqEddy::lowReOneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            LESmodelProperties(),
+            coeffDict(),
             0.07
         )
     ),
@@ -69,7 +69,7 @@ lowReOneEqEddy::lowReOneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "beta",
-            LESmodelProperties(),
+            coeffDict(),
             0.01
         )
     )
@@ -116,8 +116,8 @@ bool lowReOneEqEddy::read()
 {
     if (GenEddyVisc::read())
     {
-        ck_.readIfPresent(LESmodelProperties());
-        beta_.readIfPresent(LESmodelProperties());
+        ck_.readIfPresent(coeffDict());
+        beta_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -130,7 +130,7 @@ bool lowReOneEqEddy::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::LESmodels::lowReOneEqEddy
+    Foam::compressible::LESModels::lowReOneEqEddy
 
 Description
     One Equation Eddy Viscosity Model for compressible flow
@@ -59,7 +59,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -127,7 +127,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(oneEqEddy, 0);
-addToRunTimeSelectionTable(LESmodel, oneEqEddy, dictionary);
+addToRunTimeSelectionTable(LESModel, oneEqEddy, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -51,7 +51,7 @@ oneEqEddy::oneEqEddy
     const basicThermo& thermoPhysicalModel
 )
 :
-    LESmodel(typeName, rho, U, phi, thermoPhysicalModel),
+    LESModel(typeName, rho, U, phi, thermoPhysicalModel),
     GenEddyVisc(rho, U, phi, thermoPhysicalModel),
 
     ck_
@@ -59,7 +59,7 @@ oneEqEddy::oneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            LESmodelProperties(),
+            coeffDict(),
             0.094
         )
     )
@@ -104,7 +104,7 @@ bool oneEqEddy::read()
 {
     if (GenEddyVisc::read())
     {
-        ck_.readIfPresent(LESmodelProperties());
+        ck_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -117,7 +117,7 @@ bool oneEqEddy::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::LESmodels::oneEqEddy
+    Foam::compressible::LESModels::oneEqEddy
 
 Description
     One Equation Eddy Viscosity Model for incompressible flows
@@ -62,7 +62,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -130,7 +130,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C

@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "muSgsWallFunctionFvPatchScalarField.H"
-#include "LESmodel.H"
+#include "LESModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -36,7 +36,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -111,8 +111,8 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const LESmodel& sgsModel
-        = db().lookupObject<LESmodel>("turbulenceProperties");
+    const LESModel& sgsModel
+        = db().lookupObject<LESModel>("LESProperties");
 
     scalar kappa = dimensionedScalar(sgsModel.lookup("kappa")).value();
 
@@ -123,15 +123,15 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
 
     const scalarField& ry = patch().deltaCoeffs();
 
-    const fvPatchVectorField& U = 
+    const fvPatchVectorField& U =
         patch().lookupPatchField<volVectorField, vector>("U");
 
     scalarField magUp = mag(U.patchInternalField() - U);
 
-    const scalarField& muw = 
+    const scalarField& muw =
         patch().lookupPatchField<volScalarField, scalar>("mu");
 
-    const scalarField& rhow = 
+    const scalarField& rhow =
         patch().lookupPatchField<volScalarField, scalar>("rho");
 
     scalarField& muSgsw = *this;
@@ -147,7 +147,7 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
             (muSgsw[facei] + muw[facei])
             *magFaceGradU[facei]/rhow[facei]
         );
-                
+
         if(utau > 0)
         {
             int iter = 0;
@@ -160,21 +160,21 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
 
                 scalar f =
                     - utau/(ry[facei]*muw[facei]/rhow[facei])
-                    + magUpara/utau 
+                    + magUpara/utau
                     + 1/E*(fkUu - 1.0/6.0*kUu*sqr(kUu));
-                        
+
                 scalar df =
                     - 1.0/(ry[facei]*muw[facei]/rhow[facei])
                     - magUpara/sqr(utau)
                     - 1/E*kUu*fkUu/utau;
-                    
+
                 scalar utauNew = utau - f/df;
                 err = mag((utau - utauNew)/utau);
                 utau = utauNew;
 
             } while (utau > VSMALL && err > 0.01 && ++iter < 10);
 
-            muSgsw[facei] = 
+            muSgsw[facei] =
                 max(rhow[facei]*sqr(utau)/magFaceGradU[facei] - muw[facei],0.0);
         }
         else
@@ -191,7 +191,7 @@ makePatchTypeField(fvPatchScalarField, muSgsWallFunctionFvPatchScalarField);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::LESmodels::muSgsWallFunctionFvPatchScalarField
+    Foam::compressible::LESModels::muSgsWallFunctionFvPatchScalarField
 
 Description
     wall function boundary condition for compressible flows
@@ -44,7 +44,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -148,7 +148,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(DeardorffDiffStress, 0);
-addToRunTimeSelectionTable(LESmodel, DeardorffDiffStress, dictionary);
+addToRunTimeSelectionTable(LESModel, DeardorffDiffStress, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -51,7 +51,7 @@ DeardorffDiffStress::DeardorffDiffStress
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     GenSGSStress(U, phi, transport),
 
     ck_
@@ -59,7 +59,7 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            LESmodelProperties(),
+            coeffDict(),
             0.094
         )
     ),
@@ -68,7 +68,7 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cm",
-            LESmodelProperties(),
+            coeffDict(),
             4.13
         )
     )
@@ -129,8 +129,8 @@ bool DeardorffDiffStress::read()
 {
     if (GenSGSStress::read())
     {
-        ck_.readIfPresent(LESmodelProperties());
-        cm_.readIfPresent(LESmodelProperties());
+        ck_.readIfPresent(coeffDict());
+        cm_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -143,7 +143,7 @@ bool DeardorffDiffStress::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H

@@ -62,7 +62,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -129,7 +129,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C

@@ -32,7 +32,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -44,14 +44,14 @@ GenEddyVisc::GenEddyVisc
     transportModel& transport
 )
 :
-    LESmodel(word("GenEddyVisc"), U, phi, transport),
+    LESModel(word("GenEddyVisc"), U, phi, transport),
 
     ce_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            LESmodelProperties(),
+            coeffDict(),
             1.048
         )
     ),
@@ -69,7 +69,7 @@ GenEddyVisc::GenEddyVisc
         mesh_
     )
 {
-    printCoeffs();
+//    printCoeffs();
 }
 
 
@@ -98,15 +98,15 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevBeff(volVectorField& U) const
 
 void GenEddyVisc::correct(const tmp<volTensorField>& gradU)
 {
-    LESmodel::correct(gradU);
+    LESModel::correct(gradU);
 }
 
 
 bool GenEddyVisc::read()
 {
-    if (LESmodel::read())
+    if (LESModel::read())
     {
-        ce_.readIfPresent(LESmodelProperties());
+        ce_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -119,7 +119,7 @@ bool GenEddyVisc::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H

@@ -40,7 +40,7 @@ SourceFiles
 #ifndef GenEddyVisc_H
 #define GenEddyVisc_H
 
-#include "LESmodel.H"
+#include "LESModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,7 +48,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -57,7 +57,7 @@ namespace LES
 
 class GenEddyVisc
 :
-    virtual public LESmodel
+    virtual public LESModel
 {
     // Private Member Functions
 
@@ -130,7 +130,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C

@@ -32,7 +32,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -44,14 +44,14 @@ GenSGSStress::GenSGSStress
     transportModel& transport
 )
 :
-    LESmodel(word("GenSGSStress"), U, phi, transport),
+    LESModel(word("GenSGSStress"), U, phi, transport),
 
     ce_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            LESmodelProperties(),
+            coeffDict(),
             1.048
         )
     ),
@@ -61,7 +61,7 @@ GenSGSStress::GenSGSStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "couplingFactor",
-            LESmodelProperties(),
+            coeffDict(),
             0.0
         )
     ),
@@ -160,11 +160,11 @@ tmp<fvVectorMatrix> GenSGSStress::divDevBeff
 
 bool GenSGSStress::read()
 {
-    if (LESmodel::read())
+    if (LESModel::read())
     {
-        ce_.readIfPresent(LESmodelProperties());
+        ce_.readIfPresent(coeffDict());
 
-        couplingFactor_.readIfPresent(LESmodelProperties());
+        couplingFactor_.readIfPresent(coeffDict());
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
@@ -185,7 +185,7 @@ bool GenSGSStress::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H

@@ -41,7 +41,7 @@ SourceFiles
 #ifndef GenSGSStress_H
 #define GenSGSStress_H
 
-#include "LESmodel.H"
+#include "LESModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,7 +49,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -58,7 +58,7 @@ namespace LES
 
 class GenSGSStress
 :
-    virtual public LESmodel
+    virtual public LESModel
 {
     // Private Member Functions
 
@@ -138,7 +138,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/LESModel/LESModel.C

@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "LESmodel.H"
+#include "LESModel.H"
 #include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -36,23 +36,23 @@ namespace incompressible
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(LESmodel, 0);
-defineRunTimeSelectionTable(LESmodel, dictionary);
+defineTypeNameAndDebug(LESModel, 0);
+defineRunTimeSelectionTable(LESModel, dictionary);
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
-void LESmodel::printCoeffs()
+void LESModel::printCoeffs()
 {
     if (printCoeffs_)
     {
-        Info<< type() << "Coeffs" << LESmodelProperties_ << endl;
+        Info<< type() << "Coeffs" << coeffDict_ << endl;
     }
 }
 
 
 // * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * * //
 
-LESmodel::LESmodel
+LESModel::LESModel
 (
     const word& type,
     const volVectorField& U,
@@ -64,7 +64,7 @@ LESmodel::LESmodel
     (
         IOobject
         (
-            "turbulenceProperties",
+            "LESProperties",
             U.time().constant(),
             U.db(),
             IOobject::MUST_READ,
@@ -81,7 +81,7 @@ LESmodel::LESmodel
 
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
 
-    LESmodelProperties_(subDict(type + "Coeffs")),
+    coeffDict_(subDict(type + "Coeffs")),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
 
@@ -96,24 +96,24 @@ LESmodel::LESmodel
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void LESmodel::correct(const tmp<volTensorField>&)
+void LESModel::correct(const tmp<volTensorField>&)
 {
     delta_().correct();
     transport_.correct();
 }
 
 
-void LESmodel::correct()
+void LESModel::correct()
 {
     correct(fvc::grad(U_));
 }
 
 
-bool LESmodel::read()
+bool LESModel::read()
 {
     if (regIOobject::read())
     {
-        LESmodelProperties_ = subDict(type() + "Coeffs");
+        coeffDict_ = subDict(type() + "Coeffs");
 
         delta_().read(*this);
 

src/turbulenceModels/LES/incompressible/LESModel/LESModel.H

@@ -30,7 +30,7 @@ Description
 
 
 Class
-    Foam::incompressible::LESmodel
+    Foam::incompressible::LESModel
 
 Description
     Base class for all incompressible flow LES SGS models.
@@ -42,13 +42,13 @@ Description
     dictionary which contains the model selection and model coefficients.
 
 SourceFiles
-    LESmodel.C
-    newIsoLESmodel.C
+    LESModel.C
+    newIsoLESModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef LESmodel_H
-#define LESmodel_H
+#ifndef LESModel_H
+#define LESModel_H
 
 #include "LESdelta.H"
 #include "fvm.H"
@@ -68,10 +68,10 @@ namespace incompressible
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class LESmodel Declaration
+                           Class LESModel Declaration
 \*---------------------------------------------------------------------------*/
 
-class LESmodel
+class LESModel
 :
     public IOdictionary
 {
@@ -94,7 +94,7 @@ private:
         transportModel& transport_;
 
         Switch printCoeffs_;
-        dictionary LESmodelProperties_;
+        dictionary coeffDict_;
 
         dimensionedScalar k0_;
 
@@ -104,8 +104,8 @@ private:
     // Private Member Functions
 
         // Disallow default bitwise copy construct and assignment
-        LESmodel(const LESmodel&);
-        LESmodel& operator=(const LESmodel&);
+        LESModel(const LESModel&);
+        LESModel& operator=(const LESModel&);
 
 
 protected:
@@ -119,7 +119,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("LESmodel");
+    TypeName("LESModel");
 
 
     // Declare run-time constructor selection table
@@ -127,7 +127,7 @@ public:
         declareRunTimeSelectionTable
         (
             autoPtr,
-            LESmodel,
+            LESModel,
             dictionary,
             (
                 const volVectorField& U,
@@ -141,7 +141,7 @@ public:
     // Constructors
 
         //- Construct from components
-        LESmodel
+        LESModel
         (
             const word& type,
             const volVectorField& U,
@@ -153,7 +153,7 @@ public:
     // Selectors
 
         //- Return a reference to the selected LES model
-        static autoPtr<LESmodel> New
+        static autoPtr<LESModel> New
         (
             const volVectorField& U,
             const surfaceScalarField& phi,
@@ -163,7 +163,7 @@ public:
 
     // Destructor
 
-        virtual ~LESmodel()
+        virtual ~LESModel()
         {}
 
 
@@ -191,9 +191,9 @@ public:
 
             //- Access the dictionary which provides info. about choice of
             //  models, and all related data (particularly model coefficients).
-            inline dictionary& LESmodelProperties()
+            inline dictionary& coeffDict()
             {
-                return LESmodelProperties_;
+                return coeffDict_;
             }
 
             //- Access function to filter width

src/turbulenceModels/LES/incompressible/LESModel/newLESModel.C

@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "LESmodel.H"
+#include "LESModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -35,14 +35,14 @@ namespace incompressible
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-autoPtr<LESmodel> LESmodel::New
+autoPtr<LESModel> LESModel::New
 (
     const volVectorField& U,
     const surfaceScalarField& phi,
     transportModel& transport
 )
 {
-    word LESmodelTypeName;
+    word LESModelTypeName;
 
     // Enclose the creation of the turbulencePropertiesDict to ensure it is
     // deleted before the turbulenceModel is created otherwise the dictionary
@@ -52,7 +52,7 @@ autoPtr<LESmodel> LESmodel::New
         (
             IOobject
             (
-                "turbulenceProperties",
+                "LESProperties",
                 U.time().constant(),
                 U.db(),
                 IOobject::MUST_READ,
@@ -60,28 +60,28 @@ autoPtr<LESmodel> LESmodel::New
             )
         );
 
-        turbulencePropertiesDict.lookup("LESmodel") >> LESmodelTypeName;
+        turbulencePropertiesDict.lookup("LESModel") >> LESModelTypeName;
     }
 
-    Info<< "Selecting turbulence model " << LESmodelTypeName << endl;
+    Info<< "Selecting LES turbulence model " << LESModelTypeName << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(LESmodelTypeName);
+        dictionaryConstructorTablePtr_->find(LESModelTypeName);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "LESmodel::select(const volVectorField&, const "
+            "LESModel::select(const volVectorField&, const "
             "surfaceScalarField&, transportModel&)"
-        )   << "Unknown LESmodel type " << LESmodelTypeName
+        )   << "Unknown LESModel type " << LESModelTypeName
             << endl << endl
-            << "Valid LESmodel types are :" << endl
+            << "Valid LESModel types are :" << endl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
     }
 
-    return autoPtr<LESmodel>(cstrIter()(U, phi, transport));
+    return autoPtr<LESModel>(cstrIter()(U, phi, transport));
 }
 
 

src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(LRRDiffStress, 0);
-addToRunTimeSelectionTable(LESmodel, LRRDiffStress, dictionary);
+addToRunTimeSelectionTable(LESModel, LRRDiffStress, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -51,7 +51,7 @@ LRRDiffStress::LRRDiffStress
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     GenSGSStress(U, phi, transport),
 
     ck_
@@ -59,7 +59,7 @@ LRRDiffStress::LRRDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            LESmodelProperties(),
+            coeffDict(),
             0.09
         )
     ),
@@ -68,7 +68,7 @@ LRRDiffStress::LRRDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "c1",
-            LESmodelProperties(),
+            coeffDict(),
             1.8
         )
     ),
@@ -77,7 +77,7 @@ LRRDiffStress::LRRDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "c2",
-            LESmodelProperties(),
+            coeffDict(),
             0.6
         )
     )
@@ -139,9 +139,9 @@ bool LRRDiffStress::read()
 {
     if (GenSGSStress::read())
     {
-        ck_.readIfPresent(LESmodelProperties());
-        c1_.readIfPresent(LESmodelProperties());
-        c2_.readIfPresent(LESmodelProperties());
+        ck_.readIfPresent(coeffDict());
+        c1_.readIfPresent(coeffDict());
+        c2_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -154,7 +154,7 @@ bool LRRDiffStress::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H

@@ -60,7 +60,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -128,7 +128,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/Make/files

@@ -1,8 +1,8 @@
 vanDriestDelta/vanDriestDelta.C
 wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
 
-LESmodel/LESmodel.C
-LESmodel/newLESmodel.C
+LESModel/LESModel.C
+LESModel/newLESModel.C
 
 GenEddyVisc/GenEddyVisc.C
 GenSGSStress/GenSGSStress.C
@@ -25,4 +25,4 @@ dynMixedSmagorinsky/dynMixedSmagorinsky.C
 
 /*Smagorinsky2/Smagorinsky2.C*/
 
-LIB = $(FOAM_LIBBIN)/libincompressibleLESmodels
+LIB = $(FOAM_LIBBIN)/libincompressibleLESModels

src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(Smagorinsky, 0);
-addToRunTimeSelectionTable(LESmodel, Smagorinsky, dictionary);
+addToRunTimeSelectionTable(LESModel, Smagorinsky, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ Smagorinsky::Smagorinsky
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     GenEddyVisc(U, phi, transport),
 
     ck_
@@ -58,7 +58,7 @@ Smagorinsky::Smagorinsky
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            LESmodelProperties(),
+            coeffDict(),
             0.094
         )
     )
@@ -80,7 +80,7 @@ bool Smagorinsky::read()
 {
     if (GenEddyVisc::read())
     {
-        ck_.readIfPresent(LESmodelProperties());
+        ck_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -93,7 +93,7 @@ bool Smagorinsky::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H

@@ -59,7 +59,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -130,7 +130,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(Smagorinsky2, 0);
-addToRunTimeSelectionTable(LESmodel, Smagorinsky2, dictionary);
+addToRunTimeSelectionTable(LESModel, Smagorinsky2, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ Smagorinsky2::Smagorinsky2
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     Smagorinsky(U, phi, transport),
 
     cD2_
@@ -58,7 +58,7 @@ Smagorinsky2::Smagorinsky2
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cD2",
-            LESmodelProperties(),
+            coeffDict(),
             0.02
         )
     )
@@ -104,7 +104,7 @@ bool Smagorinsky2::read()
 {
     if (Smagorinsky::read())
     {
-        cD2.readIfPresent(LESmodelProperties());
+        cD2.readIfPresent(coeffDict());
 
         return true;
     }
@@ -117,7 +117,7 @@ bool Smagorinsky2::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H

@@ -58,7 +58,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -120,7 +120,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(SpalartAllmaras, 0);
-addToRunTimeSelectionTable(LESmodel, SpalartAllmaras, dictionary);
+addToRunTimeSelectionTable(LESModel, SpalartAllmaras, dictionary);
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
@@ -101,7 +101,7 @@ SpalartAllmaras::SpalartAllmaras
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
 
 
     alphaNut_
@@ -109,7 +109,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaNut",
-            LESmodelProperties(),
+            coeffDict(),
             1.5
         )
     ),
@@ -118,7 +118,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb1",
-            LESmodelProperties(),
+            coeffDict(),
             0.1355
         )
     ),
@@ -127,7 +127,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb2",
-            LESmodelProperties(),
+            coeffDict(),
             0.622
         )
     ),
@@ -136,7 +136,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv1",
-            LESmodelProperties(),
+            coeffDict(),
             7.1
         )
     ),
@@ -145,7 +145,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv2",
-            LESmodelProperties(),
+            coeffDict(),
             5.0
         )
     ),
@@ -154,7 +154,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "CDES",
-            LESmodelProperties(),
+            coeffDict(),
             0.65
         )
     ),
@@ -163,7 +163,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            LESmodelProperties(),
+            coeffDict(),
             0.07
         )
     ),
@@ -182,7 +182,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw2",
-            LESmodelProperties(),
+            coeffDict(),
             0.3
         )
     ),
@@ -191,7 +191,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw3",
-            LESmodelProperties(),
+            coeffDict(),
             2.0
         )
     ),
@@ -232,7 +232,7 @@ SpalartAllmaras::SpalartAllmaras
 
 void SpalartAllmaras::correct(const tmp<volTensorField>& gradU)
 {
-    LESmodel::correct(gradU);
+    LESModel::correct(gradU);
 
     if (mesh_.changing())
     {
@@ -295,18 +295,18 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevBeff(volVectorField& U) const
 
 bool SpalartAllmaras::read()
 {
-    if (LESmodel::read())
+    if (LESModel::read())
     {
-        alphaNut_.readIfPresent(LESmodelProperties());
-        Cb1_.readIfPresent(LESmodelProperties());
-        Cb2_.readIfPresent(LESmodelProperties());
+        alphaNut_.readIfPresent(coeffDict());
+        Cb1_.readIfPresent(coeffDict());
+        Cb2_.readIfPresent(coeffDict());
         Cw1_ = Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_);
-        Cw2_.readIfPresent(LESmodelProperties());
-        Cw3_.readIfPresent(LESmodelProperties());
-        Cv1_.readIfPresent(LESmodelProperties());
-        Cv2_.readIfPresent(LESmodelProperties());
-        CDES_.readIfPresent(LESmodelProperties());
-        ck_.readIfPresent(LESmodelProperties());
+        Cw2_.readIfPresent(coeffDict());
+        Cw3_.readIfPresent(coeffDict());
+        Cv1_.readIfPresent(coeffDict());
+        Cv2_.readIfPresent(coeffDict());
+        CDES_.readIfPresent(coeffDict());
+        ck_.readIfPresent(coeffDict());
         kappa_.readIfPresent(*this);
 
         return true;
@@ -320,7 +320,7 @@ bool SpalartAllmaras::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H

@@ -36,7 +36,7 @@ SourceFiles
 #ifndef SpalartAllmaras_H
 #define SpalartAllmaras_H
 
-#include "LESmodel.H"
+#include "LESModel.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,7 +45,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -54,7 +54,7 @@ namespace LES
 
 class SpalartAllmaras
 :
-    public LESmodel
+    public LESModel
 {
     // Private data
 
@@ -154,7 +154,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(dynMixedSmagorinsky, 0);
-addToRunTimeSelectionTable(LESmodel, dynMixedSmagorinsky, dictionary);
+addToRunTimeSelectionTable(LESModel, dynMixedSmagorinsky, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ dynMixedSmagorinsky::dynMixedSmagorinsky
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     scaleSimilarity(U, phi, transport),
     dynSmagorinsky(U, phi, transport)
 {
@@ -119,7 +119,7 @@ void dynMixedSmagorinsky::correct(const tmp<volTensorField>& gradU)
 
 bool dynMixedSmagorinsky::read()
 {
-    if (LESmodel::read())
+    if (LESModel::read())
     {
         scaleSimilarity::read();
         dynSmagorinsky::read();
@@ -135,7 +135,7 @@ bool dynMixedSmagorinsky::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H

@@ -70,7 +70,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -139,7 +139,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(dynOneEqEddy, 0);
-addToRunTimeSelectionTable(LESmodel, dynOneEqEddy, dictionary);
+addToRunTimeSelectionTable(LESModel, dynOneEqEddy, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -101,7 +101,7 @@ dynOneEqEddy::dynOneEqEddy
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     GenEddyVisc(U, phi, transport),
 
     k_
@@ -117,7 +117,7 @@ dynOneEqEddy::dynOneEqEddy
         mesh_
     ),
 
-    filterPtr_(LESfilter::New(U.mesh(), LESmodelProperties())),
+    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
     filter_(filterPtr_())
 {
     printCoeffs();
@@ -161,7 +161,7 @@ bool dynOneEqEddy::read()
 {
     if (GenEddyVisc::read())
     {
-        filter_.read(LESmodelProperties());
+        filter_.read(coeffDict());
 
         return true;
     }
@@ -174,7 +174,7 @@ bool dynOneEqEddy::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H

@@ -66,7 +66,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -144,7 +144,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(dynSmagorinsky, 0);
-addToRunTimeSelectionTable(LESmodel, dynSmagorinsky, dictionary);
+addToRunTimeSelectionTable(LESModel, dynSmagorinsky, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -92,7 +92,7 @@ dynSmagorinsky::dynSmagorinsky
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     GenEddyVisc(U, phi, transport),
 
     k_
@@ -108,7 +108,7 @@ dynSmagorinsky::dynSmagorinsky
         mesh_
     ),
 
-    filterPtr_(LESfilter::New(U.mesh(), LESmodelProperties())),
+    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
     filter_(filterPtr_())
 {
     printCoeffs();
@@ -125,7 +125,7 @@ dynSmagorinsky::~dynSmagorinsky()
 
 void dynSmagorinsky::correct(const tmp<volTensorField>& gradU)
 {
-    LESmodel::correct(gradU);
+    LESModel::correct(gradU);
 
     volSymmTensorField D = dev(symm(gradU));
     volScalarField magSqrD = magSqr(D);
@@ -141,7 +141,7 @@ bool dynSmagorinsky::read()
 {
     if (GenEddyVisc::read())
     {
-        filter_.read(LESmodelProperties());
+        filter_.read(coeffDict());
 
         return true;
     }
@@ -154,7 +154,7 @@ bool dynSmagorinsky::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H

@@ -75,7 +75,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -144,7 +144,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/laminar/laminar.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(laminar, 0);
-addToRunTimeSelectionTable(LESmodel, laminar, dictionary);
+addToRunTimeSelectionTable(LESModel, laminar, dictionary);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -52,7 +52,7 @@ laminar::laminar
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport)
+    LESModel(typeName, U, phi, transport)
 {}
 
 
@@ -153,13 +153,13 @@ tmp<fvVectorMatrix> laminar::divDevBeff(volVectorField& U) const
 
 bool laminar::read()
 {
-    return LESmodel::read();
+    return LESModel::read();
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/laminar/laminar.H

@@ -37,7 +37,7 @@ SourceFiles
 #ifndef laminar_H
 #define laminar_H
 
-#include "LESmodel.H"
+#include "LESModel.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,7 +46,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -55,7 +55,7 @@ namespace LES
 
 class laminar
 :
-    public LESmodel
+    public LESModel
 {
     // Private member functions
 
@@ -119,7 +119,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(locDynOneEqEddy, 0);
-addToRunTimeSelectionTable(LESmodel, locDynOneEqEddy, dictionary);
+addToRunTimeSelectionTable(LESModel, locDynOneEqEddy, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -88,7 +88,7 @@ locDynOneEqEddy::locDynOneEqEddy
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     GenEddyVisc(U, phi, transport),
 
     k_
@@ -105,7 +105,7 @@ locDynOneEqEddy::locDynOneEqEddy
     ),
 
     simpleFilter_(U.mesh()),
-    filterPtr_(LESfilter::New(U.mesh(), LESmodelProperties())),
+    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
     filter_(filterPtr_())
 {
     printCoeffs();
@@ -122,7 +122,7 @@ locDynOneEqEddy::~locDynOneEqEddy()
 
 void locDynOneEqEddy::correct(const tmp<volTensorField>& gradU)
 {
-    LESmodel::correct(gradU);
+    LESModel::correct(gradU);
 
     volSymmTensorField D = symm(gradU);
 
@@ -152,7 +152,7 @@ bool locDynOneEqEddy::read()
 {
     if (GenEddyVisc::read())
     {
-        filter_.read(LESmodelProperties());
+        filter_.read(coeffDict());
 
         return true;
     }
@@ -165,7 +165,7 @@ bool locDynOneEqEddy::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H

@@ -74,7 +74,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -162,7 +162,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(mixedSmagorinsky, 0);
-addToRunTimeSelectionTable(LESmodel, mixedSmagorinsky, dictionary);
+addToRunTimeSelectionTable(LESModel, mixedSmagorinsky, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ mixedSmagorinsky::mixedSmagorinsky
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     scaleSimilarity(U, phi, transport),
     Smagorinsky(U, phi, transport)
 {
@@ -122,7 +122,7 @@ void mixedSmagorinsky::correct(const tmp<volTensorField>& gradU)
 
 bool mixedSmagorinsky::read()
 {
-    if (LESmodel::read())
+    if (LESModel::read())
     {
         scaleSimilarity::read();
         Smagorinsky::read();
@@ -138,7 +138,7 @@ bool mixedSmagorinsky::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H

@@ -69,7 +69,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -145,7 +145,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(oneEqEddy, 0);
-addToRunTimeSelectionTable(LESmodel, oneEqEddy, dictionary);
+addToRunTimeSelectionTable(LESModel, oneEqEddy, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ oneEqEddy::oneEqEddy
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     GenEddyVisc(U, phi, transport),
 
     k_
@@ -71,7 +71,7 @@ oneEqEddy::oneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            LESmodelProperties(),
+            coeffDict(),
             0.094
         )
     )
@@ -109,7 +109,7 @@ bool oneEqEddy::read()
 {
     if (GenEddyVisc::read())
     {
-        ck_.readIfPresent(LESmodelProperties());
+        ck_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -122,7 +122,7 @@ bool oneEqEddy::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H

@@ -63,7 +63,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -137,7 +137,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C

@@ -32,7 +32,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -48,8 +48,8 @@ scaleSimilarity::scaleSimilarity
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
-    filterPtr_(LESfilter::New(U.mesh(), LESmodelProperties())),
+    LESModel(typeName, U, phi, transport),
+    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
     filter_(filterPtr_())
 {
     printCoeffs();
@@ -102,9 +102,9 @@ void scaleSimilarity::correct(const tmp<volTensorField>&)
 
 bool scaleSimilarity::read()
 {
-    if (LESmodel::read())
+    if (LESModel::read())
     {
-        filter_.read(LESmodelProperties());
+        filter_.read(coeffDict());
 
         return true;
     }
@@ -117,7 +117,7 @@ bool scaleSimilarity::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H

@@ -40,7 +40,7 @@ SourceFiles
 #ifndef scaleSimilarity_H
 #define scaleSimilarity_H
 
-#include "LESmodel.H"
+#include "LESModel.H"
 #include "LESfilter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,7 +49,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -58,7 +58,7 @@ namespace LES
 
 class scaleSimilarity
 :
-    virtual public LESmodel
+    virtual public LESModel
 {
     // Private data
 
@@ -123,7 +123,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(spectEddyVisc, 0);
-addToRunTimeSelectionTable(LESmodel, spectEddyVisc, dictionary);
+addToRunTimeSelectionTable(LESModel, spectEddyVisc, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -51,7 +51,7 @@ spectEddyVisc::spectEddyVisc
     transportModel& transport
 )
 :
-    LESmodel(typeName, U, phi, transport),
+    LESModel(typeName, U, phi, transport),
     GenEddyVisc(U, phi, transport),
 
 
@@ -60,7 +60,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cB",
-            LESmodelProperties(),
+            coeffDict(),
             8.22
         )
     ),
@@ -69,7 +69,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK1",
-            LESmodelProperties(),
+            coeffDict(),
             0.83
         )
     ),
@@ -78,7 +78,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK2",
-            LESmodelProperties(),
+            coeffDict(),
             1.03
         )
     ),
@@ -87,7 +87,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK3",
-            LESmodelProperties(),
+            coeffDict(),
             4.75
         )
     ),
@@ -96,7 +96,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK4",
-            LESmodelProperties(),
+            coeffDict(),
             2.55
         )
     )
@@ -143,11 +143,11 @@ bool spectEddyVisc::read()
 {
     if (GenEddyVisc::read())
     {
-        cB_.readIfPresent(LESmodelProperties());
-        cK1_.readIfPresent(LESmodelProperties());
-        cK2_.readIfPresent(LESmodelProperties());
-        cK3_.readIfPresent(LESmodelProperties());
-        cK4_.readIfPresent(LESmodelProperties());
+        cB_.readIfPresent(coeffDict());
+        cK1_.readIfPresent(coeffDict());
+        cK2_.readIfPresent(coeffDict());
+        cK3_.readIfPresent(coeffDict());
+        cK4_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -160,7 +160,7 @@ bool spectEddyVisc::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H

@@ -63,7 +63,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -127,7 +127,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C

@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "vanDriestDelta.H"
-#include "LESmodel.H"
+#include "LESModel.H"
 #include "wallFvPatch.H"
 #include "wallDistData.H"
 #include "wallPointYPlus.H"
@@ -37,7 +37,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -49,8 +49,8 @@ addToRunTimeSelectionTable(LESdelta, vanDriestDelta, dictionary);
 
 void vanDriestDelta::calcDelta()
 {
-    const LESmodel& sgsModel
-        = mesh_.lookupObject<LESmodel>("turbulenceProperties");
+    const LESModel& sgsModel
+        = mesh_.lookupObject<LESModel>("LESProperties");
 
     const volVectorField& U = sgsModel.U();
     const volScalarField& nu = sgsModel.nu();
@@ -144,7 +144,7 @@ void vanDriestDelta::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H

@@ -44,7 +44,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -103,7 +103,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C

@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "nuSgsWallFunctionFvPatchScalarField.H"
-#include "LESmodel.H"
+#include "LESModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -36,7 +36,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -100,8 +100,8 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const LESmodel& sgsModel
-        = db().lookupObject<LESmodel>("turbulenceProperties");
+    const LESModel& sgsModel
+        = db().lookupObject<LESModel>("LESProperties");
 
     scalar kappa = dimensionedScalar(sgsModel.lookup("kappa")).value();
 
@@ -173,7 +173,7 @@ makePatchTypeField(fvPatchScalarField, nuSgsWallFunctionFvPatchScalarField);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H

@@ -44,7 +44,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace LES
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -140,7 +140,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LES
+} // End namespace LESModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/LRR/LRR.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(LRR, 0);
-addToRunTimeSelectionTable(RASmodel, LRR, dictionary);
+addToRunTimeSelectionTable(RASModel, LRR, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -53,14 +53,14 @@ LRR::LRR
     basicThermo& thermophysicalModel
 )
 :
-    RASmodel(typeName, rho, U, phi, thermophysicalModel),
+    RASModel(typeName, rho, U, phi, thermophysicalModel),
 
     Cmu_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -69,7 +69,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Clrr1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.8
         )
     ),
@@ -78,7 +78,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Clrr2",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.6
         )
     ),
@@ -87,7 +87,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.44
         )
     ),
@@ -96,7 +96,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.92
         )
     ),
@@ -105,7 +105,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cs",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.25
         )
     ),
@@ -114,7 +114,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Ceps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.15
         )
     ),
@@ -123,7 +123,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "couplingFactor",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.0
         )
     ),
@@ -132,7 +132,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaR",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.22
         )
     ),
@@ -141,7 +141,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.76923
         )
     ),
@@ -150,7 +150,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphah",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -274,19 +274,19 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
 
 bool LRR::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        Cmu_.readIfPresent(RASmodelCoeffs_);
-        Clrr1_.readIfPresent(RASmodelCoeffs_);
-        Clrr2_.readIfPresent(RASmodelCoeffs_);
-        C1_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        Cs_.readIfPresent(RASmodelCoeffs_);
-        Ceps_.readIfPresent(RASmodelCoeffs_);
-        alphaR_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
-        alphah_.readIfPresent(RASmodelCoeffs_);
-        couplingFactor_.readIfPresent(RASmodelCoeffs_);
+        Cmu_.readIfPresent(coeffDict_);
+        Clrr1_.readIfPresent(coeffDict_);
+        Clrr2_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        Cs_.readIfPresent(coeffDict_);
+        Ceps_.readIfPresent(coeffDict_);
+        alphaR_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
+        alphah_.readIfPresent(coeffDict_);
+        couplingFactor_.readIfPresent(coeffDict_);
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
@@ -314,7 +314,7 @@ void LRR::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
     volScalarField G = 0.5*tr(P);
@@ -444,7 +444,7 @@ void LRR::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/LRR/LRR.H

@@ -38,7 +38,7 @@ SourceFiles
 #ifndef compressibleLRR_H
 #define compressibleLRR_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -55,7 +55,7 @@ namespace RAS
 
 class LRR
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -172,7 +172,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C

@@ -36,13 +36,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(LaunderGibsonRSTM, 0);
-addToRunTimeSelectionTable(RASmodel, LaunderGibsonRSTM, dictionary);
+addToRunTimeSelectionTable(RASModel, LaunderGibsonRSTM, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -55,14 +55,14 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
     basicThermo& thermophysicalModel
 )
 :
-    RASmodel(typeName, rho, U, phi, thermophysicalModel),
+    RASModel(typeName, rho, U, phi, thermophysicalModel),
 
     Cmu_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -71,7 +71,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Clg1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.8
         )
     ),
@@ -80,7 +80,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Clg2",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.6
         )
     ),
@@ -89,7 +89,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.44
         )
     ),
@@ -98,7 +98,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.92
         )
     ),
@@ -107,7 +107,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cs",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.25
         )
     ),
@@ -116,7 +116,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Ceps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.15
         )
     ),
@@ -125,7 +125,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1Ref",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.5
         )
     ),
@@ -134,7 +134,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2Ref",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.3
         )
     ),
@@ -143,7 +143,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "couplingFactor",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.0
         )
     ),
@@ -152,7 +152,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaR",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.22
         )
     ),
@@ -161,7 +161,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.76923
         )
     ),
@@ -170,7 +170,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphah",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -296,22 +296,22 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
 
 bool LaunderGibsonRSTM::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        Cmu_.readIfPresent(RASmodelCoeffs_);
-        Clg1_.readIfPresent(RASmodelCoeffs_);
-        Clg2_.readIfPresent(RASmodelCoeffs_);
-        C1_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        Cs_.readIfPresent(RASmodelCoeffs_);
-        Ceps_.readIfPresent(RASmodelCoeffs_);
-        C1Ref_.readIfPresent(RASmodelCoeffs_);
-        C2Ref_.readIfPresent(RASmodelCoeffs_);
-        alphaR_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
-        alphah_.readIfPresent(RASmodelCoeffs_);
+        Cmu_.readIfPresent(coeffDict_);
+        Clg1_.readIfPresent(coeffDict_);
+        Clg2_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        Cs_.readIfPresent(coeffDict_);
+        Ceps_.readIfPresent(coeffDict_);
+        C1Ref_.readIfPresent(coeffDict_);
+        C2Ref_.readIfPresent(coeffDict_);
+        alphaR_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
+        alphah_.readIfPresent(coeffDict_);
 
-        couplingFactor_.readIfPresent(RASmodelCoeffs_);
+        couplingFactor_.readIfPresent(coeffDict_);
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
@@ -339,7 +339,7 @@ void LaunderGibsonRSTM::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     if (mesh_.changing())
     {
@@ -484,7 +484,7 @@ void LaunderGibsonRSTM::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H

@@ -37,7 +37,7 @@ SourceFiles
 #ifndef compressibleLaunderGibsonRSTM_H
 #define compressibleLaunderGibsonRSTM_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "wallDistReflection.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,7 +46,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -55,7 +55,7 @@ namespace RAS
 
 class LaunderGibsonRSTM
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -179,7 +179,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(LaunderSharmaKE, 0);
-addToRunTimeSelectionTable(RASmodel, LaunderSharmaKE, dictionary);
+addToRunTimeSelectionTable(RASModel, LaunderSharmaKE, dictionary);
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
@@ -69,14 +69,14 @@ LaunderSharmaKE::LaunderSharmaKE
     basicThermo& thermophysicalModel
 )
 :
-    RASmodel(typeName, rho, U, phi, thermophysicalModel),
+    RASModel(typeName, rho, U, phi, thermophysicalModel),
 
     Cmu_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -85,7 +85,7 @@ LaunderSharmaKE::LaunderSharmaKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.44
         )
     ),
@@ -94,7 +94,7 @@ LaunderSharmaKE::LaunderSharmaKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.92
         )
     ),
@@ -103,7 +103,7 @@ LaunderSharmaKE::LaunderSharmaKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C3",
-            RASmodelCoeffs_,
+            coeffDict_,
             -0.33
         )
     ),
@@ -112,7 +112,7 @@ LaunderSharmaKE::LaunderSharmaKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphak",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -121,7 +121,7 @@ LaunderSharmaKE::LaunderSharmaKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.76923
         )
     ),
@@ -130,7 +130,7 @@ LaunderSharmaKE::LaunderSharmaKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphah",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -232,15 +232,15 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
 
 bool LaunderSharmaKE::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        Cmu_.readIfPresent(RASmodelCoeffs_);
-        C1_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        C3_.readIfPresent(RASmodelCoeffs_);
-        alphak_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
-        alphah_.readIfPresent(RASmodelCoeffs_);
+        Cmu_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        C3_.readIfPresent(coeffDict_);
+        alphak_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
+        alphah_.readIfPresent(coeffDict_);
 
         return true;
     }
@@ -260,7 +260,7 @@ void LaunderSharmaKE::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     // Calculate parameters and coefficients for Launder-Sharma low-Reynolds
     // number model
@@ -324,7 +324,7 @@ void LaunderSharmaKE::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H

@@ -38,7 +38,7 @@ SourceFiles
 #ifndef compressibleLaunderSharmaKE_H
 #define compressibleLaunderSharmaKE_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -55,7 +55,7 @@ namespace RAS
 
 class LaunderSharmaKE
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -166,7 +166,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/Make/files

@@ -1,5 +1,5 @@
-RASmodel/RASmodel.C
-RASmodel/newRASmodel.C
+RASModel/RASModel.C
+RASModel/newRASModel.C
 laminar/laminar.C
 kEpsilon/kEpsilon.C
 RNGkEpsilon/RNGkEpsilon.C
@@ -12,4 +12,4 @@ kOmegaSST/kOmegaSST.C
 
 wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
 
-LIB = $(FOAM_LIBBIN)/libcompressibleRASmodels
+LIB = $(FOAM_LIBBIN)/libcompressibleRASModels

src/turbulenceModels/RAS/compressible/RASModel/RASModel.C

@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "wallDist.H"
 #include "wallFvPatch.H"
 #include "fixedValueFvPatchFields.H"
@@ -38,23 +38,23 @@ namespace compressible
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(RASmodel, 0);
-defineRunTimeSelectionTable(RASmodel, dictionary);
+defineTypeNameAndDebug(RASModel, 0);
+defineRunTimeSelectionTable(RASModel, dictionary);
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
-void RASmodel::printCoeffs()
+void RASModel::printCoeffs()
 {
     if (printCoeffs_)
     {
-        Info<< type() << "Coeffs" << RASmodelCoeffs_ << endl;
+        Info<< type() << "Coeffs" << coeffDict_ << endl;
     }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-RASmodel::RASmodel
+RASModel::RASModel
 (
     const word& type,
     const volScalarField& rho,
@@ -67,7 +67,7 @@ RASmodel::RASmodel
     (
         IOobject
         (
-            "turbulenceProperties",
+            "RASProperties",
             U.time().constant(),
             U.db(),
             IOobject::MUST_READ,
@@ -85,7 +85,7 @@ RASmodel::RASmodel
 
     turbulence_(lookup("turbulence")),
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    RASmodelCoeffs_(subDict(type + "Coeffs")),
+    coeffDict_(subDict(type + "Coeffs")),
 
     kappa_
     (
@@ -108,7 +108,7 @@ RASmodel::RASmodel
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-scalar RASmodel::yPlusLam(const scalar kappa, const scalar E)
+scalar RASModel::yPlusLam(const scalar kappa, const scalar E)
 {
     scalar ypl = 11.0;
 
@@ -121,7 +121,7 @@ scalar RASmodel::yPlusLam(const scalar kappa, const scalar E)
 }
 
 
-tmp<scalarField> RASmodel::yPlus(const label patchNo) const
+tmp<scalarField> RASModel::yPlus(const label patchNo) const
 {
     const fvPatch& curPatch = mesh_.boundary()[patchNo];
 
@@ -130,7 +130,7 @@ tmp<scalarField> RASmodel::yPlus(const label patchNo) const
 
     if (typeid(curPatch) == typeid(wallFvPatch))
     {
-        scalar Cmu(readScalar(RASmodelCoeffs_.lookup("Cmu")));
+        scalar Cmu(readScalar(coeffDict_.lookup("Cmu")));
 
         Yp = pow(Cmu, 0.25)
             *y_[patchNo]
@@ -144,7 +144,7 @@ tmp<scalarField> RASmodel::yPlus(const label patchNo) const
     {
         WarningIn
         (
-            "tmp<scalarField> RASmodel::yPlus(const label patchNo) const"
+            "tmp<scalarField> RASModel::yPlus(const label patchNo) const"
         )   << "Patch " << patchNo << " is not a wall.  Returning blank field"
             << endl;
 
@@ -155,7 +155,7 @@ tmp<scalarField> RASmodel::yPlus(const label patchNo) const
 }
 
 
-void RASmodel::correct()
+void RASModel::correct()
 {
     if (mesh_.changing())
     {
@@ -164,12 +164,12 @@ void RASmodel::correct()
 }
 
 
-bool RASmodel::read()
+bool RASModel::read()
 {
     if (regIOobject::read())
     {
         lookup("turbulence") >> turbulence_;
-        RASmodelCoeffs_ = subDict(type() + "Coeffs");
+        coeffDict_ = subDict(type() + "Coeffs");
 
         subDict("wallFunctionCoeffs").readIfPresent<scalar>("kappa", kappa_);
         subDict("wallFunctionCoeffs").readIfPresent<scalar>("E", E_);

src/turbulenceModels/RAS/compressible/RASModel/RASModel.H

@@ -30,14 +30,14 @@ Description
 
 
 Class
-    Foam::compressible::RASmodel
+    Foam::compressible::RASModel
 
 Description
     Abstract base class for turbulence models for compressible and combusting
     flows.
 
 SourceFiles
-    RASmodel.C
+    RASModel.C
     newTurbulenceModel.C
 
 \*---------------------------------------------------------------------------*/
@@ -66,10 +66,10 @@ namespace compressible
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class RASmodel Declaration
+                           Class RASModel Declaration
 \*---------------------------------------------------------------------------*/
 
-class RASmodel
+class RASModel
 :
     public IOdictionary
 {
@@ -89,7 +89,7 @@ protected:
 
         Switch turbulence_;
         Switch printCoeffs_;
-        dictionary RASmodelCoeffs_;
+        dictionary coeffDict_;
 
         scalar kappa_;
         scalar E_;
@@ -121,16 +121,16 @@ private:
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        RASmodel(const RASmodel&);
+        RASModel(const RASModel&);
 
         //- Disallow default bitwise assignment
-        void operator=(const RASmodel&);
+        void operator=(const RASModel&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("RASmodel");
+    TypeName("RASModel");
 
 
     // Declare run-time constructor selection table
@@ -138,7 +138,7 @@ public:
         declareRunTimeSelectionTable
         (
             autoPtr,
-            RASmodel,
+            RASModel,
             dictionary,
             (
                 const volScalarField& rho,
@@ -153,7 +153,7 @@ public:
     // Constructors
 
         //- Construct from components
-        RASmodel
+        RASModel
         (
             const word& type,
             const volScalarField& rho,
@@ -166,7 +166,7 @@ public:
     // Selectors
 
         //- Return a reference to the selected turbulence model
-        static autoPtr<RASmodel> New
+        static autoPtr<RASModel> New
         (
             const volScalarField& rho,
             const volVectorField& U,
@@ -177,7 +177,7 @@ public:
 
     // Destructor
 
-        virtual ~RASmodel()
+        virtual ~RASModel()
         {}
 
 
@@ -244,6 +244,12 @@ public:
                 return yPlusLam_;
             }
 
+            //- Const access to the coefficients dictionary
+            const dictionary& coeffDict()
+            {
+                return coeffDict_;
+            }
+
 
         //- Return the laminar viscosity
         const volScalarField& mu() const

src/turbulenceModels/RAS/compressible/RASModel/newRASModel.C

@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "RASmodel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -35,7 +35,7 @@ namespace compressible
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-autoPtr<RASmodel> RASmodel::New
+autoPtr<RASModel> RASModel::New
 (
     const volScalarField& rho,
     const volVectorField& U,
@@ -43,17 +43,17 @@ autoPtr<RASmodel> RASmodel::New
     basicThermo& thermophysicalModel
 )
 {
-    word RASmodelTypeName;
+    word RASModelTypeName;
 
     // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the RASmodel is created otherwise the dictionary
+    // deleted before the RASModel is created otherwise the dictionary
     // is entered in the database twice
     {
         IOdictionary turbulencePropertiesDict
         (
             IOobject
             (
-                "turbulenceProperties",
+                "RASProperties",
                 U.time().constant(),
                 U.db(),
                 IOobject::MUST_READ,
@@ -61,30 +61,30 @@ autoPtr<RASmodel> RASmodel::New
             )
         );
 
-        turbulencePropertiesDict.lookup("RASmodel")
-            >> RASmodelTypeName;
+        turbulencePropertiesDict.lookup("RASModel")
+            >> RASModelTypeName;
     }
 
-    Info<< "Selecting turbulence model " << RASmodelTypeName << endl;
+    Info<< "Selecting RAS turbulence model " << RASModelTypeName << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(RASmodelTypeName);
+        dictionaryConstructorTablePtr_->find(RASModelTypeName);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "RASmodel::New(const volScalarField& rho, "
+            "RASModel::New(const volScalarField& rho, "
             "const volVectorField& U, const surfaceScalarField& phi, "
             "basicThermo&)"
-        )   << "Unknown RASmodel type " << RASmodelTypeName
+        )   << "Unknown RASModel type " << RASModelTypeName
             << endl << endl
-            << "Valid RASmodel types are :" << endl
+            << "Valid RASModel types are :" << endl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
     }
 
-    return autoPtr<RASmodel>
+    return autoPtr<RASModel>
     (
         cstrIter()(rho, U, phi, thermophysicalModel)
     );

src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(RNGkEpsilon, 0);
-addToRunTimeSelectionTable(RASmodel, RNGkEpsilon, dictionary);
+addToRunTimeSelectionTable(RASModel, RNGkEpsilon, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -53,14 +53,14 @@ RNGkEpsilon::RNGkEpsilon
     basicThermo& thermophysicalModel
 )
 :
-    RASmodel(typeName, rho, U, phi, thermophysicalModel),
+    RASModel(typeName, rho, U, phi, thermophysicalModel),
 
     Cmu_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.0845
         )
     ),
@@ -69,7 +69,7 @@ RNGkEpsilon::RNGkEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.42
         )
     ),
@@ -78,7 +78,7 @@ RNGkEpsilon::RNGkEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.68
         )
     ),
@@ -87,7 +87,7 @@ RNGkEpsilon::RNGkEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C3",
-            RASmodelCoeffs_,
+            coeffDict_,
             -0.33
         )
     ),
@@ -96,7 +96,7 @@ RNGkEpsilon::RNGkEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphak",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.39
         )
     ),
@@ -105,7 +105,7 @@ RNGkEpsilon::RNGkEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.39
         )
     ),
@@ -114,7 +114,7 @@ RNGkEpsilon::RNGkEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphah",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -123,7 +123,7 @@ RNGkEpsilon::RNGkEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "eta0",
-            RASmodelCoeffs_,
+            coeffDict_,
             4.38
         )
     ),
@@ -132,7 +132,7 @@ RNGkEpsilon::RNGkEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "beta",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.012
         )
     ),
@@ -236,17 +236,17 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff(volVectorField& U) const
 
 bool RNGkEpsilon::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        Cmu_.readIfPresent(RASmodelCoeffs_);
-        C1_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        C3_.readIfPresent(RASmodelCoeffs_);
-        alphak_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
-        alphah_.readIfPresent(RASmodelCoeffs_);
-        eta0_.readIfPresent(RASmodelCoeffs_);
-        beta_.readIfPresent(RASmodelCoeffs_);
+        Cmu_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        C3_.readIfPresent(coeffDict_);
+        alphak_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
+        alphah_.readIfPresent(coeffDict_);
+        eta0_.readIfPresent(coeffDict_);
+        beta_.readIfPresent(coeffDict_);
 
         return true;
     }
@@ -266,7 +266,7 @@ void RNGkEpsilon::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));
 
@@ -336,7 +336,7 @@ void RNGkEpsilon::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H

@@ -37,7 +37,7 @@ SourceFiles
 #ifndef compressibleRNGkEpsilon_H
 #define compressibleRNGkEpsilon_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,7 +45,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -54,7 +54,7 @@ namespace RAS
 
 class RNGkEpsilon
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -161,7 +161,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(SpalartAllmaras, 0);
-addToRunTimeSelectionTable(RASmodel, SpalartAllmaras, dictionary);
+addToRunTimeSelectionTable(RASModel, SpalartAllmaras, dictionary);
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
@@ -113,14 +113,14 @@ SpalartAllmaras::SpalartAllmaras
     basicThermo& thermophysicalModel
 )
 :
-    RASmodel(typeName, rho, U, phi, thermophysicalModel),
+    RASModel(typeName, rho, U, phi, thermophysicalModel),
 
     alphaNut_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaNut",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.5
         )
     ),
@@ -129,7 +129,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphah",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -139,7 +139,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb1",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.1355
         )
     ),
@@ -148,7 +148,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb2",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.622
         )
     ),
@@ -158,7 +158,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw2",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.3
         )
     ),
@@ -167,7 +167,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw3",
-            RASmodelCoeffs_,
+            coeffDict_,
             2.0
         )
     ),
@@ -176,7 +176,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv1",
-            RASmodelCoeffs_,
+            coeffDict_,
             7.1
         )
     ),
@@ -185,7 +185,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv2",
-            RASmodelCoeffs_,
+            coeffDict_,
             5.0
         )
     ),
@@ -278,18 +278,18 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff(volVectorField& U) const
 
 bool SpalartAllmaras::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        alphaNut_.readIfPresent(RASmodelCoeffs_);
-        alphah_.readIfPresent(RASmodelCoeffs_);
+        alphaNut_.readIfPresent(coeffDict_);
+        alphah_.readIfPresent(coeffDict_);
 
-        Cb1_.readIfPresent(RASmodelCoeffs_);
-        Cb2_.readIfPresent(RASmodelCoeffs_);
+        Cb1_.readIfPresent(coeffDict_);
+        Cb2_.readIfPresent(coeffDict_);
         Cw1_ = Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_);
-        Cw2_.readIfPresent(RASmodelCoeffs_);
-        Cw3_.readIfPresent(RASmodelCoeffs_);
-        Cv1_.readIfPresent(RASmodelCoeffs_);
-        Cv2_.readIfPresent(RASmodelCoeffs_);
+        Cw2_.readIfPresent(coeffDict_);
+        Cw3_.readIfPresent(coeffDict_);
+        Cv1_.readIfPresent(coeffDict_);
+        Cv2_.readIfPresent(coeffDict_);
 
         return true;
     }
@@ -309,7 +309,7 @@ void SpalartAllmaras::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     if (mesh_.changing())
     {
@@ -346,7 +346,7 @@ void SpalartAllmaras::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H

@@ -53,7 +53,7 @@ SourceFiles
 #ifndef compressibleSpalartAllmaras_H
 #define combressibleSpalartAllmaras_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -62,7 +62,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -71,7 +71,7 @@ namespace RAS
 
 class SpalartAllmaras
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -219,7 +219,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(kEpsilon, 0);
-addToRunTimeSelectionTable(RASmodel, kEpsilon, dictionary);
+addToRunTimeSelectionTable(RASModel, kEpsilon, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -52,14 +52,14 @@ kEpsilon::kEpsilon
     basicThermo& thermophysicalModel
 )
 :
-    RASmodel(typeName, rho, U, phi, thermophysicalModel),
+    RASModel(typeName, rho, U, phi, thermophysicalModel),
 
     Cmu_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -68,7 +68,7 @@ kEpsilon::kEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.44
         )
     ),
@@ -77,7 +77,7 @@ kEpsilon::kEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.92
         )
     ),
@@ -86,7 +86,7 @@ kEpsilon::kEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C3",
-            RASmodelCoeffs_,
+            coeffDict_,
             -0.33
         )
     ),
@@ -95,7 +95,7 @@ kEpsilon::kEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphak",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -104,7 +104,7 @@ kEpsilon::kEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.76923
         )
     ),
@@ -113,7 +113,7 @@ kEpsilon::kEpsilon
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphah",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -218,15 +218,15 @@ tmp<fvVectorMatrix> kEpsilon::divDevRhoReff(volVectorField& U) const
 
 bool kEpsilon::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        Cmu_.readIfPresent(RASmodelCoeffs_);
-        C1_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        C3_.readIfPresent(RASmodelCoeffs_);
-        alphak_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
-        alphah_.readIfPresent(RASmodelCoeffs_);
+        Cmu_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        C3_.readIfPresent(coeffDict_);
+        alphak_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
+        alphah_.readIfPresent(coeffDict_);
 
         return true;
     }
@@ -247,7 +247,7 @@ void kEpsilon::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));
 
@@ -310,7 +310,7 @@ void kEpsilon::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H

@@ -37,7 +37,7 @@ SourceFiles
 #ifndef compressiblekEpsilon_H
 #define compressiblekEpsilon_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,7 +45,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -54,7 +54,7 @@ namespace RAS
 
 class kEpsilon
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -165,7 +165,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(kOmegaSST, 0);
-addToRunTimeSelectionTable(RASmodel, kOmegaSST, dictionary);
+addToRunTimeSelectionTable(RASModel, kOmegaSST, dictionary);
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
@@ -95,14 +95,14 @@ kOmegaSST::kOmegaSST
     basicThermo& thermophysicalModel
 )
 :
-    RASmodel(typeName, rho, U, phi, thermophysicalModel),
+    RASModel(typeName, rho, U, phi, thermophysicalModel),
 
     alphaK1_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaK1",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.85034
         )
     ),
@@ -111,7 +111,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaK2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -120,7 +120,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaOmega1",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.5
         )
     ),
@@ -129,7 +129,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaOmega2",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.85616
         )
     ),
@@ -138,7 +138,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphah",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -147,7 +147,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "gamma1",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.5532
         )
     ),
@@ -156,7 +156,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "gamma2",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.4403
         )
     ),
@@ -165,7 +165,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "beta1",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.075
         )
     ),
@@ -174,7 +174,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "beta2",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.0828
         )
     ),
@@ -183,7 +183,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "betaStar",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -192,7 +192,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "a1",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.31
         )
     ),
@@ -201,7 +201,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "c1",
-            RASmodelCoeffs_,
+            coeffDict_,
             10.0
         )
     ),
@@ -214,7 +214,7 @@ kOmegaSST::kOmegaSST
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -320,21 +320,21 @@ tmp<fvVectorMatrix> kOmegaSST::divDevRhoReff(volVectorField& U) const
 
 bool kOmegaSST::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        alphaK1_.readIfPresent(RASmodelCoeffs_);
-        alphaK2_.readIfPresent(RASmodelCoeffs_);
-        alphaOmega1_.readIfPresent(RASmodelCoeffs_);
-        alphaOmega2_.readIfPresent(RASmodelCoeffs_);
-        alphah_.readIfPresent(RASmodelCoeffs_);
-        gamma1_.readIfPresent(RASmodelCoeffs_);
-        gamma2_.readIfPresent(RASmodelCoeffs_);
-        beta1_.readIfPresent(RASmodelCoeffs_);
-        beta2_.readIfPresent(RASmodelCoeffs_);
-        betaStar_.readIfPresent(RASmodelCoeffs_);
-        a1_.readIfPresent(RASmodelCoeffs_);
-        c1_.readIfPresent(RASmodelCoeffs_);
-        Cmu_.readIfPresent(RASmodelCoeffs_);
+        alphaK1_.readIfPresent(coeffDict_);
+        alphaK2_.readIfPresent(coeffDict_);
+        alphaOmega1_.readIfPresent(coeffDict_);
+        alphaOmega2_.readIfPresent(coeffDict_);
+        alphah_.readIfPresent(coeffDict_);
+        gamma1_.readIfPresent(coeffDict_);
+        gamma2_.readIfPresent(coeffDict_);
+        beta1_.readIfPresent(coeffDict_);
+        beta2_.readIfPresent(coeffDict_);
+        betaStar_.readIfPresent(coeffDict_);
+        a1_.readIfPresent(coeffDict_);
+        c1_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict_);
 
         return true;
     }
@@ -357,7 +357,7 @@ void kOmegaSST::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));
 
@@ -436,7 +436,7 @@ void kOmegaSST::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H

@@ -63,7 +63,7 @@ SourceFiles
 #ifndef compressiblekOmegaSST_H
 #define compressiblekOmegaSST_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -72,7 +72,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -81,7 +81,7 @@ namespace RAS
 
 class kOmegaSST
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -271,7 +271,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/laminar/laminar.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(laminar, 0);
-addToRunTimeSelectionTable(RASmodel, laminar, dictionary);
+addToRunTimeSelectionTable(RASModel, laminar, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -51,7 +51,7 @@ laminar::laminar
     basicThermo& thermophysicalModel
 )
 :
-    RASmodel(typeName, rho, U, phi, thermophysicalModel)
+    RASModel(typeName, rho, U, phi, thermophysicalModel)
 {}
 
 
@@ -178,7 +178,7 @@ tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
 
 bool laminar::read()
 {
-    return RASmodel::read();
+    return RASModel::read();
 }
 
 
@@ -188,7 +188,7 @@ void laminar::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/laminar/laminar.H

@@ -37,7 +37,7 @@ SourceFiles
 #ifndef compressibleLaminar_H
 #define compressibleLaminar_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,7 +45,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -54,7 +54,7 @@ namespace RAS
 
 class laminar
 :
-    public RASmodel
+    public RASModel
 {
 
 public:
@@ -124,7 +124,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(realizableKE, 0);
-addToRunTimeSelectionTable(RASmodel, realizableKE, dictionary);
+addToRunTimeSelectionTable(RASModel, realizableKE, dictionary);
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
@@ -93,14 +93,14 @@ realizableKE::realizableKE
     basicThermo& thermophysicalModel
 )
 :
-    RASmodel(typeName, rho, U, phi, thermophysicalModel),
+    RASModel(typeName, rho, U, phi, thermophysicalModel),
 
     Cmu_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -109,7 +109,7 @@ realizableKE::realizableKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "A0",
-            RASmodelCoeffs_,
+            coeffDict_,
             4.0
         )
     ),
@@ -118,7 +118,7 @@ realizableKE::realizableKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.9
         )
     ),
@@ -127,7 +127,7 @@ realizableKE::realizableKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphak",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -136,7 +136,7 @@ realizableKE::realizableKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.833333
         )
     ),
@@ -145,7 +145,7 @@ realizableKE::realizableKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphah",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -251,14 +251,14 @@ tmp<fvVectorMatrix> realizableKE::divDevRhoReff(volVectorField& U) const
 
 bool realizableKE::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        Cmu_.readIfPresent(RASmodelCoeffs_);
-        A0_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        alphak_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
-        alphah_.readIfPresent(RASmodelCoeffs_);
+        Cmu_.readIfPresent(coeffDict_);
+        A0_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        alphak_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
+        alphah_.readIfPresent(coeffDict_);
 
         return true;
     }
@@ -278,7 +278,7 @@ void realizableKE::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));
 
@@ -347,7 +347,7 @@ void realizableKE::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H

@@ -47,7 +47,7 @@ SourceFiles
 #ifndef realizableKE_H
 #define realizableKE_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -55,7 +55,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -64,7 +64,7 @@ namespace RAS
 
 class realizableKE
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -179,7 +179,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C

@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "mutStandardRoughWallFunctionFvPatchScalarField.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -36,7 +36,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -120,8 +120,8 @@ void mutStandardRoughWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const RASmodel& rasModel
-        = db().lookupObject<RASmodel>("turbulenceProperties");
+    const RASModel& rasModel
+        = db().lookupObject<RASModel>("RASProperties");
 
     const scalar kappa = rasModel.kappa();
     const scalar E = rasModel.E();
@@ -304,7 +304,7 @@ makePatchTypeField
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H

@@ -44,7 +44,7 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -189,7 +189,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace compressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H

@@ -78,7 +78,7 @@ Description
                 label faceCelli = curPatch.faceCells()[facei];
 
                 scalar yPlus =
-                    Cmu25*RASmodel::y_[patchi][facei]
+                    Cmu25*RASModel::y_[patchi][facei]
                    *sqrt(k_[faceCelli])
                    /(muw[facei]/rhow[facei]);
 
@@ -90,7 +90,7 @@ Description
 
                 epsilon_[faceCelli] +=
                     Cmu75*pow(k_[faceCelli], 1.5)
-                   /(kappa_*RASmodel::y_[patchi][facei]);
+                   /(kappa_*RASModel::y_[patchi][facei]);
 
                 if (yPlus > yPlusLam_)
                 {
@@ -98,7 +98,7 @@ Description
                         (mutw[facei] + muw[facei])
                        *magFaceGradU[facei]
                        *Cmu25*sqrt(k_[faceCelli])
-                       /(kappa_*RASmodel::y_[patchi][facei]);
+                       /(kappa_*RASModel::y_[patchi][facei]);
                 }
             }
         }

src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H

@@ -51,7 +51,7 @@ Description
                 label faceCelli = curPatch.faceCells()[facei];
 
                 scalar yPlus =
-                    Cmu25*RASmodel::y_[patchi][facei]
+                    Cmu25*RASModel::y_[patchi][facei]
                    *sqrt(k_[faceCelli])/(muw[facei]/rhow[facei]);
 
                 if (yPlus > yPlusLam_)

src/turbulenceModels/RAS/incompressible/LRR/LRR.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(LRR, 0);
-addToRunTimeSelectionTable(RASmodel, LRR, dictionary);
+addToRunTimeSelectionTable(RASModel, LRR, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -52,14 +52,14 @@ LRR::LRR
     transportModel& lamTransportModel
 )
 :
-    RASmodel(typeName, U, phi, lamTransportModel),
+    RASModel(typeName, U, phi, lamTransportModel),
 
     Cmu_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -68,7 +68,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Clrr1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.8
         )
     ),
@@ -77,7 +77,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Clrr2",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.6
         )
     ),
@@ -86,7 +86,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.44
         )
     ),
@@ -95,7 +95,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.92
         )
     ),
@@ -104,7 +104,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cs",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.25
         )
     ),
@@ -113,7 +113,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Ceps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.15
         )
     ),
@@ -122,7 +122,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.76923
         )
     ),
@@ -131,7 +131,7 @@ LRR::LRR
         dimensioned<scalar>::lookupOrAddToDict
         (
             "couplingFactor",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.0
         )
     ),
@@ -247,18 +247,18 @@ tmp<fvVectorMatrix> LRR::divDevReff(volVectorField& U) const
 
 bool LRR::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        Cmu_.readIfPresent(RASmodelCoeffs_);
-        Clrr1_.readIfPresent(RASmodelCoeffs_);
-        Clrr2_.readIfPresent(RASmodelCoeffs_);
-        C1_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        Cs_.readIfPresent(RASmodelCoeffs_);
-        Ceps_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
+        Cmu_.readIfPresent(coeffDict_);
+        Clrr1_.readIfPresent(coeffDict_);
+        Clrr2_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        Cs_.readIfPresent(coeffDict_);
+        Ceps_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
 
-        couplingFactor_.readIfPresent(RASmodelCoeffs_);
+        couplingFactor_.readIfPresent(coeffDict_);
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
@@ -286,7 +286,7 @@ void LRR::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
     volScalarField G = 0.5*tr(P);
@@ -415,7 +415,7 @@ void LRR::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/incompressible/LRR/LRR.H

@@ -37,7 +37,7 @@ SourceFiles
 #ifndef LRR_H
 #define LRR_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,7 +45,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -54,7 +54,7 @@ namespace RAS
 
 class LRR
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -159,7 +159,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(LamBremhorstKE, 0);
-addToRunTimeSelectionTable(RASmodel, LamBremhorstKE, dictionary);
+addToRunTimeSelectionTable(RASModel, LamBremhorstKE, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -51,14 +51,14 @@ LamBremhorstKE::LamBremhorstKE
     transportModel& lamTransportModel
 )
 :
-    RASmodel(typeName, U, phi, lamTransportModel),
+    RASModel(typeName, U, phi, lamTransportModel),
 
     Cmu_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -67,7 +67,7 @@ LamBremhorstKE::LamBremhorstKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.44
         )
     ),
@@ -76,7 +76,7 @@ LamBremhorstKE::LamBremhorstKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.92
         )
     ),
@@ -85,7 +85,7 @@ LamBremhorstKE::LamBremhorstKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.76923
         )
     ),
@@ -187,12 +187,12 @@ tmp<fvVectorMatrix> LamBremhorstKE::divDevReff(volVectorField& U) const
 
 bool LamBremhorstKE::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        Cmu_.readIfPresent(RASmodelCoeffs_);
-        C1_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
+        Cmu_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
 
         return true;
     }
@@ -212,7 +212,7 @@ void LamBremhorstKE::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     if (mesh_.changing())
     {
@@ -273,7 +273,7 @@ void LamBremhorstKE::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H

@@ -37,7 +37,7 @@ SourceFiles
 #ifndef LamBremhorstKE_H
 #define LamBremhorstKE_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,7 +46,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -55,7 +55,7 @@ namespace RAS
 
 class LamBremhorstKE
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -154,7 +154,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(LaunderGibsonRSTM, 0);
-addToRunTimeSelectionTable(RASmodel, LaunderGibsonRSTM, dictionary);
+addToRunTimeSelectionTable(RASModel, LaunderGibsonRSTM, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -52,14 +52,14 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
     transportModel& lamTransportModel
 )
 :
-    RASmodel(typeName, U, phi, lamTransportModel),
+    RASModel(typeName, U, phi, lamTransportModel),
 
     Cmu_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -68,7 +68,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Clg1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.8
         )
     ),
@@ -77,7 +77,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Clg2",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.6
         )
     ),
@@ -86,7 +86,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.44
         )
     ),
@@ -95,7 +95,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.92
         )
     ),
@@ -104,7 +104,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cs",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.25
         )
     ),
@@ -113,7 +113,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Ceps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.15
         )
     ),
@@ -122,7 +122,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaR",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.22
         )
     ),
@@ -131,7 +131,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.76923
         )
     ),
@@ -140,7 +140,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1Ref",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.5
         )
     ),
@@ -149,7 +149,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2Ref",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.3
         )
     ),
@@ -158,7 +158,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         dimensioned<scalar>::lookupOrAddToDict
         (
             "couplingFactor",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.0
         )
     ),
@@ -271,21 +271,21 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevReff(volVectorField& U) const
 
 bool LaunderGibsonRSTM::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        Cmu_.readIfPresent(RASmodelCoeffs_);
-        Clg1_.readIfPresent(RASmodelCoeffs_);
-        Clg2_.readIfPresent(RASmodelCoeffs_);
-        C1_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        Cs_.readIfPresent(RASmodelCoeffs_);
-        Ceps_.readIfPresent(RASmodelCoeffs_);
-        alphaR_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
-        C1Ref_.readIfPresent(RASmodelCoeffs_);
-        C2Ref_.readIfPresent(RASmodelCoeffs_);
+        Cmu_.readIfPresent(coeffDict_);
+        Clg1_.readIfPresent(coeffDict_);
+        Clg2_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        Cs_.readIfPresent(coeffDict_);
+        Ceps_.readIfPresent(coeffDict_);
+        alphaR_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
+        C1Ref_.readIfPresent(coeffDict_);
+        C2Ref_.readIfPresent(coeffDict_);
 
-        couplingFactor_.readIfPresent(RASmodelCoeffs_);
+        couplingFactor_.readIfPresent(coeffDict_);
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
@@ -313,7 +313,7 @@ void LaunderGibsonRSTM::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     if (mesh_.changing())
     {
@@ -457,7 +457,7 @@ void LaunderGibsonRSTM::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H

@@ -36,7 +36,7 @@ SourceFiles
 #ifndef LaunderGibsonRSTM_H
 #define LaunderGibsonRSTM_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "wallDistReflection.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,7 +45,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -54,7 +54,7 @@ namespace RAS
 
 class LaunderGibsonRSTM
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -165,7 +165,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C

@@ -33,13 +33,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(LaunderSharmaKE, 0);
-addToRunTimeSelectionTable(RASmodel, LaunderSharmaKE, dictionary);
+addToRunTimeSelectionTable(RASModel, LaunderSharmaKE, dictionary);
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
@@ -66,14 +66,14 @@ LaunderSharmaKE::LaunderSharmaKE
     transportModel& lamTransportModel
 )
 :
-    RASmodel(typeName, U, phi, lamTransportModel),
+    RASModel(typeName, U, phi, lamTransportModel),
 
     Cmu_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.09
         )
     ),
@@ -82,7 +82,7 @@ LaunderSharmaKE::LaunderSharmaKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.44
         )
     ),
@@ -91,7 +91,7 @@ LaunderSharmaKE::LaunderSharmaKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.92
         )
     ),
@@ -100,7 +100,7 @@ LaunderSharmaKE::LaunderSharmaKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.76923
         )
     ),
@@ -192,12 +192,12 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevReff(volVectorField& U) const
 
 bool LaunderSharmaKE::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        Cmu_.readIfPresent(RASmodelCoeffs_);
-        C1_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
+        Cmu_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
 
         return true;
     }
@@ -217,7 +217,7 @@ void LaunderSharmaKE::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     volScalarField S2 = 2*magSqr(symm(fvc::grad(U_)));
 
@@ -268,7 +268,7 @@ void LaunderSharmaKE::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H

@@ -37,7 +37,7 @@ SourceFiles
 #ifndef LaunderSharmaKE_H
 #define LaunderSharmaKE_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,7 +45,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -54,7 +54,7 @@ namespace RAS
 
 class LaunderSharmaKE
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -155,7 +155,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C

@@ -34,13 +34,13 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace RAS
+namespace RASModels
 {
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(LienCubicKE, 0);
-addToRunTimeSelectionTable(RASmodel, LienCubicKE, dictionary);
+addToRunTimeSelectionTable(RASModel, LienCubicKE, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -52,14 +52,14 @@ LienCubicKE::LienCubicKE
     transportModel& lamTransportModel
 )
 :
-    RASmodel(typeName, U, phi, lamTransportModel),
+    RASModel(typeName, U, phi, lamTransportModel),
 
     C1_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.44
         )
     ),
@@ -68,7 +68,7 @@ LienCubicKE::LienCubicKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "C2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.92
         )
     ),
@@ -77,7 +77,7 @@ LienCubicKE::LienCubicKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphak",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.0
         )
     ),
@@ -86,7 +86,7 @@ LienCubicKE::LienCubicKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.76923
         )
     ),
@@ -95,7 +95,7 @@ LienCubicKE::LienCubicKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "A1",
-            RASmodelCoeffs_,
+            coeffDict_,
             1.25
         )
     ),
@@ -104,7 +104,7 @@ LienCubicKE::LienCubicKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "A2",
-            RASmodelCoeffs_,
+            coeffDict_,
             1000.0
         )
     ),
@@ -113,7 +113,7 @@ LienCubicKE::LienCubicKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Ctau1",
-            RASmodelCoeffs_,
+            coeffDict_,
             -4.0
         )
     ),
@@ -122,7 +122,7 @@ LienCubicKE::LienCubicKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Ctau2",
-            RASmodelCoeffs_,
+            coeffDict_,
             13.0
         )
     ),
@@ -131,7 +131,7 @@ LienCubicKE::LienCubicKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Ctau3",
-            RASmodelCoeffs_,
+            coeffDict_,
             -2.0
         )
     ),
@@ -140,7 +140,7 @@ LienCubicKE::LienCubicKE
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaKsi",
-            RASmodelCoeffs_,
+            coeffDict_,
             0.9
         )
     ),
@@ -277,18 +277,18 @@ tmp<fvVectorMatrix> LienCubicKE::divDevReff(volVectorField& U) const
 
 bool LienCubicKE::read()
 {
-    if (RASmodel::read())
+    if (RASModel::read())
     {
-        C1_.readIfPresent(RASmodelCoeffs_);
-        C2_.readIfPresent(RASmodelCoeffs_);
-        alphak_.readIfPresent(RASmodelCoeffs_);
-        alphaEps_.readIfPresent(RASmodelCoeffs_);
-        A1_.readIfPresent(RASmodelCoeffs_);
-        A2_.readIfPresent(RASmodelCoeffs_);
-        Ctau1_.readIfPresent(RASmodelCoeffs_);
-        Ctau2_.readIfPresent(RASmodelCoeffs_);
-        Ctau3_.readIfPresent(RASmodelCoeffs_);
-        alphaKsi_.readIfPresent(RASmodelCoeffs_);
+        C1_.readIfPresent(coeffDict_);
+        C2_.readIfPresent(coeffDict_);
+        alphak_.readIfPresent(coeffDict_);
+        alphaEps_.readIfPresent(coeffDict_);
+        A1_.readIfPresent(coeffDict_);
+        A2_.readIfPresent(coeffDict_);
+        Ctau1_.readIfPresent(coeffDict_);
+        Ctau2_.readIfPresent(coeffDict_);
+        Ctau3_.readIfPresent(coeffDict_);
+        alphaKsi_.readIfPresent(coeffDict_);
 
         return true;
     }
@@ -308,7 +308,7 @@ void LienCubicKE::correct()
         return;
     }
 
-    RASmodel::correct();
+    RASModel::correct();
 
     gradU_ = fvc::grad(U_);
 
@@ -398,7 +398,7 @@ void LienCubicKE::correct()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace incompressible
 } // End namespace Foam
 

src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H

@@ -36,7 +36,7 @@ SourceFiles
 #ifndef LienCubicKE_H
 #define LienCubicKE_H
 
-#include "RASmodel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,7 +44,7 @@ namespace Foam
 {
 namespace incompressible
 {
-namespace RAS
+namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -53,7 +53,7 @@ namespace RAS
 
 class LienCubicKE
 :
-    public RASmodel
+    public RASModel
 {
     // Private data
 
@@ -162,7 +162,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RAS
+} // End namespace RASModels
 } // End namespace incompressible
 } // End namespace Foam