consistency updates

56fd8890 · Andrew Heather · 8a9d0320 · 56fd8890 · 56fd8890 · 56fd8890
Commit 56fd8890 authored Jun 20, 2008 by Andrew Heather
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@@ -20,7 +20,7 @@ EXE_INC = \
 EXE_LIBS = \
    -lengine \
    -lmeshTools \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
    -lbasicThermophysicalModels \
    -lcombustionThermophysicalModels \
    -lspecie \

--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -58,7 +58,7 @@ Description

 #include "fvCFD.H"
 #include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"
 #include "PDRDragModel.H"

--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -59,7 +59,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"
 #include "PDRDragModel.H"

--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
@@ -45,7 +45,7 @@ Foam::XiEqModels::basicSubGrid::basicSubGrid
 (
    const dictionary& XiEqProperties,
    const hhuCombustionThermo& thermo,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& Su
 )
 :

--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
@@ -94,7 +94,7 @@ public:
        (
            const dictionary& XiEqProperties,
            const hhuCombustionThermo& thermo,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& Su
        );


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

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


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

--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
@@ -38,7 +38,7 @@ SourceFiles

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

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

        dictionary PDRDragModelCoeffs_;

-        const compressible::RASmodel& turbulence_;
+        const compressible::RASModel& turbulence_;
        const volScalarField& rho_;
        const volVectorField& U_;
        const surfaceScalarField& phi_;
@@ -96,7 +96,7 @@ public:
            dictionary,
            (
                const dictionary& PDRProperties,
-                const compressible::RASmodel& turbulence,
+                const compressible::RASModel& turbulence,
                const volScalarField& rho,
                const volVectorField& U,
                const surfaceScalarField& phi
@@ -117,7 +117,7 @@ public:
        static autoPtr<PDRDragModel> New
        (
            const dictionary& PDRProperties,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& rho,
            const volVectorField& U,
            const surfaceScalarField& phi
@@ -130,7 +130,7 @@ public:
        PDRDragModel
        (
            const dictionary& PDRProperties,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& rho,
            const volVectorField& U,
            const surfaceScalarField& phi

--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
@@ -31,7 +31,7 @@ License
 Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
 (
    const dictionary& PDRProperties,
-    const compressible::RASmodel& turbulence,
+    const compressible::RASModel& turbulence,
    const volScalarField& rho,
    const volVectorField& U,
    const surfaceScalarField& phi

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

--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
@@ -86,7 +86,7 @@ public:
        basic
        (
            const dictionary& PDRProperties,
-            const compressible::RASmodel& turbulence,
+            const compressible::RASModel& turbulence,
            const volScalarField& rho,
            const volVectorField& U,
            const surfaceScalarField& phi

--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -35,13 +35,13 @@ namespace Foam
 {
 namespace compressible
 {
-namespace RAS
+namespace RASModels
 {

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

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

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

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

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

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

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

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

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

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

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

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


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

 #   include "wallViscosityI.H"

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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


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

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


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

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


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

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