diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index 29dd6139689a4f39f7cb5d771489cad88dc8c0d7..9f019439a740e7d54561e71fb5c5c3ddefe6d468 100644
--- 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 \
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index 2a1dff685242344f730e3b6ec3ea7b944a6b3516..d1ef77dcfc8b97d734b20881342ff003f650db77 100644
--- 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"
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 8734c86b5eacc40563b003d5d146f3b6df6e90bc..98d6f8c531aa2ef9c623bf0144ec0e56b553d3e6 100644
--- 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"
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
index 462152ebb5ed75076370b5c887281b2954a0d9af..445aec41c8bd6f2f6e4d1aa2c936be5f5bdc3c26 100644
--- 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
)
:
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
index d7ebb38267b16dd3dededb5319eda2f23eae0e11..f964405830e0fc49361d2cf3a99afaf71cf5c793 100644
--- 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
);
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
index 802caf3cbfbf2c4b8131fbc2c6ec003359821d09..c2e2904dc47809e5593aae0d45db6add2fa3ce4d 100644
--- 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
)
:
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
index 9e5d8334f119750c59f23894b1c29f4c32a2f83c..4573506f51b65067aa9e1e80f618b06e66d22145 100644
--- 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
);
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
index aa37217fceb0ae2d46b96b828d3ad0d58525c6ed..30e3b2ad6d09148a1b6ce5fa1afc681d5ef5dd08 100644
--- 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
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
index b66632cd6117122ce34312bff3ef6b8974f735a7..ac43bd1e6515b8c14e4eb3bd89ed9048f5cabfd6 100644
--- 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
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
index f099e94a5e180f6fd3d09f9b44198cbd18647646..fdc1b6ea762f5d8c47c9572057b847b0d90dad69 100644
--- 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
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
index 8ea763f8b736c6c1fb4e7a204f722a77ac07b065..9bd6f666e8c161db95d6f3d93ea028f70086a255 100644
--- 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
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
index cf68c7c22807c9e34943c12fdc4cd1fbd22b2587..cca7ba4aaa187f71bab4e8d8efd3b57d9d2dcf0b 100644
--- 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
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 244e7858be4bffbd7defeed8cdc91d7aaa7258ea..780dc972560861b9a45245a656e91ba6a36755dc 100644
--- 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
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
index f093e2f84f622e0ea8943410ae676751d4570da8..519eb8dfa4367c53bf8aa288b1f42bf059e73a36 100644
--- 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
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
index 15737f637946ab47fbbef6ab9fcda47980ad5169..15c7a340d61edce08d5bc33d94492b6aa1a16b8e 100644
--- 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
)
:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
index 5d2b28d7c3969d5f91accef1d12e3295528609b7..3a6c436f106388cf3275e08ca3b14be400cddb6b 100644
--- 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
);
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
index 2b75efb54ebb0b71a7b33285a3522068cdbf3110..78911ab7b549f40e99391c58db508a531b0a7fbe 100644
--- 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
)
:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
index d490dfdb959859f8ffbb9775aeb50e922f245519..8be0139b9a1494cc286e31756633129f4652804a 100644
--- 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
);
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
index 5536ad8890c4271acee9ae36b28b83cbad0d6ce3..599678323841d8280127f1bd189ce4a0a670d830 100644
--- 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
)
:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
index 3e9c04e522c4fb5f9e30d78fabc61588a134f7ba..168739437020fccbad4ab5a4bde98ae18830f4d8 100644
--- 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
);
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
index 9d3d6b05d48d7151ef5881280d2667ce862420b7..80dc5e13c5507f92bf85765d16a86b0b0b643903 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
@@ -41,7 +41,7 @@ Foam::XiEqModel::XiEqModel
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
)
:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
index 423b61ca9708452f2a53767f11538e7fc56ef2ed..08055241db06b9a66a36b02d9e2ce9c991a5f370 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
@@ -38,7 +38,7 @@ SourceFiles
#include "IOdictionary.H"
#include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +60,7 @@ protected:
dictionary XiEqModelCoeffs_;
const hhuCombustionThermo& thermo_;
- const compressible::RASmodel& turbulence_;
+ const compressible::RASModel& turbulence_;
const volScalarField& Su_;
@@ -91,7 +91,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
),
(
@@ -110,7 +110,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
);
@@ -122,7 +122,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
);
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
index a8885e56ef03f1d7e79d31208fb918af6c1b7374..e66f75c64cb31c616fdca276804c705261b99357 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
@@ -32,7 +32,7 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
)
{
@@ -50,7 +50,7 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
"XiEqModel::New"
"("
" const hhuCombustionThermo& thermo,"
- " const compressible::RASmodel& turbulence,"
+ " const compressible::RASModel& turbulence,"
" const volScalarField& Su"
")"
) << "Unknown XiEqModel type "
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
index 4f42953aa92018f795a67b27adee566c9fd485f4..357e872823148a6332a6ed4eef82f0c8cbb5a69e 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
@@ -45,7 +45,7 @@ Foam::XiEqModels::instability::instability
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
)
:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
index 249a1910c9e00de8decb6d5778af9a9da8f9f155..cd9f0b6ff2a52578fe50b4dd9ced2ea6ab4b71e8 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
@@ -83,7 +83,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
);
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
index d71b810bbecfb0a6c75f606ba4d8ae8563ac934b..6025be6d45f67dd5ad31e8a8b11da50bbcb331d9 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
@@ -45,7 +45,7 @@ Foam::XiGModels::KTS::KTS
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
)
:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
index 6c9a3963e3ff998cf730601cf2433728817ab6c0..00dccf4e52e808b0bd8eb77590200bfc78c2258e 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
@@ -80,7 +80,7 @@ public:
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
);
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C
index 029dce0e727be0c5246957a0cb6867153b627415..d7cc735ac41374fd71d869d3caf8a9919d119b34 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C
@@ -41,7 +41,7 @@ Foam::XiGModel::XiGModel
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
)
:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
index 1549fd85e6c211a54a2c5a0e5dbced2357e344c3..a990d732c27a97965304500fc4d674b07549c52c 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
@@ -38,7 +38,7 @@ SourceFiles
#include "IOdictionary.H"
#include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +60,7 @@ protected:
dictionary XiGModelCoeffs_;
const hhuCombustionThermo& thermo_;
- const compressible::RASmodel& turbulence_;
+ const compressible::RASModel& turbulence_;
const volScalarField& Su_;
@@ -91,7 +91,7 @@ public:
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
),
(
@@ -110,7 +110,7 @@ public:
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
);
@@ -122,7 +122,7 @@ public:
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
);
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
index 0cd7e7b0ccfc93b0846a8a65463c1082f5e5d5b2..46fbf4b007e73ae3eb6dede6ff2736e6bea98bf5 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
@@ -32,7 +32,7 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
)
{
@@ -50,7 +50,7 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
"XiGModel::New"
"("
" const hhuCombustionThermo& thermo,"
- " const compressible::RASmodel& turbulence,"
+ " const compressible::RASModel& turbulence,"
" const volScalarField& Su"
")"
) << "Unknown XiGModel type "
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C
index 3d98e02da51189df8b521a011e5b87f813f3256a..d99b65f9d28dd0f805240ad6651b2c90f0a1f717 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C
@@ -45,7 +45,7 @@ Foam::XiGModels::instabilityG::instabilityG
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
)
:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
index 03214e8eec43e25d75fc472a2da516f8bf47be3b..815f26091e50630eb3df3b760a211521bd22b18c 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
@@ -87,7 +87,7 @@ public:
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su
);
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C
index 5fee002dd0946f2ac2397bcdd9be18b5c7b60bc0..844647eb2bc97a26bd25965dde39f85d2cf1e868 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C
@@ -41,7 +41,7 @@ Foam::XiModel::XiModel
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
index b3b8c021b6fbf794efbe95a8ed32040860b8929d..3ca2f89209e445270c1734322aec293367ee6176 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
@@ -38,7 +38,7 @@ SourceFiles
#include "IOdictionary.H"
#include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
#include "multivariateSurfaceInterpolationScheme.H"
#include "runTimeSelectionTables.H"
@@ -61,7 +61,7 @@ protected:
dictionary XiModelCoeffs_;
const hhuCombustionThermo& thermo_;
- const compressible::RASmodel& turbulence_;
+ const compressible::RASModel& turbulence_;
const volScalarField& Su_;
const volScalarField& rho_;
const volScalarField& b_;
@@ -98,7 +98,7 @@ public:
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
@@ -123,7 +123,7 @@ public:
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
@@ -138,7 +138,7 @@ public:
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
index 774ef73621899a1dfba4afe36e77d638a4dff4b4..a35c6aa40c558178e57cc7b6b6d271d991636a3c 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
@@ -32,7 +32,7 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
index 72087b83ae4676883bf96324ff22d57885956a20..060c8ebba9764bf95d76b0285d4309f57bd11b05 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
@@ -45,7 +45,7 @@ Foam::XiModels::algebraic::algebraic
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
index 65790864966229d2a5a6cc7da1e40ff781683ee2..5168c73993d56f97fa6d00c385ac4fcc5585eac6 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
@@ -86,7 +86,7 @@ public:
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.C b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.C
index 0ff4b90c14d8a3568e2284dbd2de798fb3e1ea08..83858309c97692e30b0d43e422b1a84be8854f55 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.C
@@ -45,7 +45,7 @@ Foam::XiModels::fixed::fixed
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
index d963111d437bf2aad9ce479873f7e70a0f9be050..41e46f00509e5b14e7b69965a3a0450091fe1441 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
@@ -75,7 +75,7 @@ public:
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
index 19914fe9937744ffaafb45a97de76c38451feeb3..a25eb1dbda02a39c83dffaa5f28a04a18911ac62 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
@@ -45,7 +45,7 @@ Foam::XiModels::transport::transport
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
index 4394d1a5995caa9f4064170ebfcc7e6c65a45909..d7ce57cdd0fcca5b5be5137c74e02c65840f7311 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
@@ -86,7 +86,7 @@ public:
(
const dictionary& XiProperties,
const hhuCombustionThermo& thermo,
- const compressible::RASmodel& turbulence,
+ const compressible::RASModel& turbulence,
const volScalarField& Su,
const volScalarField& rho,
const volScalarField& b,
diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H
index f593fe44ee70ce18eee022aa3e0a3a3afa63f016..ba07a6dd4659b3c5e127efa8b96abd634611d42a 100644
--- a/applications/solvers/combustion/PDRFoam/createFields.H
+++ b/applications/solvers/combustion/PDRFoam/createFields.H
@@ -47,9 +47,9 @@
# include "compressibleCreatePhi.H"
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options
index 2b553eed811c5d51577358a20c0ccf2cd23894d4..69ded9ae575e0cfeeb48216b1b008527c7114b36 100644
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@@ -12,7 +12,7 @@ EXE_LIBS = \
-lengine \
-lfiniteVolume \
-lmeshTools \
- -lcompressibleRASmodels \
+ -lcompressibleRASModels \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lspecie \
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index ddf37d4644723b1492f8fb1cb778860a027426be..84bb0550e8e965456d3c411b3cf67729a9d7a758 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -52,7 +52,7 @@ Description
#include "fvCFD.H"
#include "hhuCombustionThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "laminarFlameSpeed.H"
#include "ignition.H"
#include "Switch.H"
diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H
index 1fc0e978ba0845314201420d7ff0867640259e43..737680fefaab26582550f83784ceac1548c52797 100644
--- a/applications/solvers/combustion/XiFoam/createFields.H
+++ b/applications/solvers/combustion/XiFoam/createFields.H
@@ -48,9 +48,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/combustion/Xoodles/Make/options b/applications/solvers/combustion/Xoodles/Make/options
index 085bbba8f4e6446109dc9d454248a87c025b34de..92932f16d07d0676c663e911aae6d9eca290501a 100644
--- a/applications/solvers/combustion/Xoodles/Make/options
+++ b/applications/solvers/combustion/Xoodles/Make/options
@@ -19,5 +19,5 @@ EXE_LIBS = \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lspecie \
- -lcompressibleLESmodels \
+ -lcompressibleLESModels \
-llaminarFlameSpeedModels
diff --git a/applications/solvers/combustion/Xoodles/Xoodles.C b/applications/solvers/combustion/Xoodles/Xoodles.C
index 8da304cf8414b6db18cfab2d6713799c08157010..bc1045414d2c0980d7a26d90e152d75fb9d1b6c4 100644
--- a/applications/solvers/combustion/Xoodles/Xoodles.C
+++ b/applications/solvers/combustion/Xoodles/Xoodles.C
@@ -52,7 +52,7 @@ Description
#include "fvCFD.H"
#include "hhuCombustionThermo.H"
-#include "compressible/LESmodel/LESmodel.H"
+#include "compressible/LESModel/LESModel.H"
#include "laminarFlameSpeed.H"
#include "ignition.H"
#include "IFstream.H"
diff --git a/applications/solvers/combustion/Xoodles/createFields.H b/applications/solvers/combustion/Xoodles/createFields.H
index 8a08143e3a1952f2dd802e1bccd828d6262c70b4..8a12db6f1bd568c7716637a2621d5370ea63d025 100644
--- a/applications/solvers/combustion/Xoodles/createFields.H
+++ b/applications/solvers/combustion/Xoodles/createFields.H
@@ -48,9 +48,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::LESmodel> turbulence
+ autoPtr<compressible::LESModel> turbulence
(
- compressible::LESmodel::New(rho, U, phi, thermo())
+ compressible::LESModel::New(rho, U, phi, thermo())
);
diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options
index 249e46bef160da35d9b0231cbcf4c2b8ca9d262b..fef39c4afdf7591c7dba2a7f1d0d481195a803f5 100644
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@@ -11,6 +11,6 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lfiniteVolume \
- -lcompressibleRASmodels \
+ -lcompressibleRASModels \
-lbasicThermophysicalModels \
-lspecie
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index d8afa9055b02ea5071ef73c8cfd83bd492b9fab4..01c5f3a8d536e4efe0e186965dc232d98d4e1856 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -34,7 +34,7 @@ Description
#include "engineTime.H"
#include "engineMesh.H"
#include "basicThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
#include "OFstream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H
index bbd63d6afaf0f3f0129dcd638deb8effafb5a077..ed7c012d53724516d7c55eabde7f3bef8f722f5e 100644
--- a/applications/solvers/combustion/coldEngineFoam/createFields.H
+++ b/applications/solvers/combustion/coldEngineFoam/createFields.H
@@ -42,9 +42,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options
index 65b7d2478f66e25ee56cf2563cb54a2a6a83dd11..a5cbe01e35179e3c32fc77606b0d71196d94d3b6 100644
--- a/applications/solvers/combustion/dieselEngineFoam/Make/options
+++ b/applications/solvers/combustion/dieselEngineFoam/Make/options
@@ -18,7 +18,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
- -lcompressibleRASmodels \
+ -lcompressibleRASModels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-llagrangian \
diff --git a/applications/solvers/combustion/dieselEngineFoam/createFields.H b/applications/solvers/combustion/dieselEngineFoam/createFields.H
index be045381c0e471b0c99f20c994634a051333149f..c07aa63cdb927fd1c382d7ea8d90103286085e7a 100644
--- a/applications/solvers/combustion/dieselEngineFoam/createFields.H
+++ b/applications/solvers/combustion/dieselEngineFoam/createFields.H
@@ -58,9 +58,9 @@ volScalarField kappa
);
Info << "Creating turbulence model.\n" << nl;
-autoPtr<compressible::RASmodel> turbulence
+autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index 3256de1de5c0435de848016c5fa2650d78855585..6997f770ecedc99374356e5200919ab86081859e 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -34,7 +34,7 @@ Description
#include "engineTime.H"
#include "engineMesh.H"
#include "hCombustionThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "spray.H"
#include "chemistryModel.H"
#include "chemistrySolver.H"
diff --git a/applications/solvers/combustion/dieselFoam/Make/options b/applications/solvers/combustion/dieselFoam/Make/options
index 6ebc1c61917b2897a4ba3106155f7eebe8fac6c7..605042aa498dbfb1d9a7cf2907819b8feb787deb 100644
--- a/applications/solvers/combustion/dieselFoam/Make/options
+++ b/applications/solvers/combustion/dieselFoam/Make/options
@@ -16,7 +16,7 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude
EXE_LIBS = \
- -lcompressibleRASmodels \
+ -lcompressibleRASModels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-llagrangian \
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index c0041f1cd2a367aec682e0f2c7db41cd98029dc1..7f0d8ae3fc0c21f475379ccab5a0a816f9f4485c 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "hCombustionThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "spray.H"
#include "chemistryModel.H"
#include "chemistrySolver.H"
diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/engineFoam/Make/options
index afda5ce4a5300c785750f162443622afccd88285..73b365c001c66ea05300ec897dd67dea657d343f 100644
--- a/applications/solvers/combustion/engineFoam/Make/options
+++ b/applications/solvers/combustion/engineFoam/Make/options
@@ -11,7 +11,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lfiniteVolume \
- -lcompressibleRASmodels \
+ -lcompressibleRASModels \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lspecie \
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index 9f9d693b5b89e988f14b60374e15e3f1b2b134bb..1ad62baa667d959a3d5fd4aa5e79a88c9d951bb7 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -53,7 +53,7 @@ Description
#include "engineTime.H"
#include "engineMesh.H"
#include "hhuCombustionThermo.H"
-#include "RASmodel.H"
+#include "RASModel.H"
#include "laminarFlameSpeed.H"
#include "ignition.H"
#include "Switch.H"
diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options
index 179a2cfd6bda78cf4c62cf2933e985ab74d0bd62..2753c31bf0f5bc29f8cba61619fa1f49bd98741e 100644
--- a/applications/solvers/combustion/reactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude
EXE_LIBS = \
- -lcompressibleRASmodels \
+ -lcompressibleRASModels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-lspecie \
diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H
index be045381c0e471b0c99f20c994634a051333149f..c07aa63cdb927fd1c382d7ea8d90103286085e7a 100644
--- a/applications/solvers/combustion/reactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/createFields.H
@@ -58,9 +58,9 @@ volScalarField kappa
);
Info << "Creating turbulence model.\n" << nl;
-autoPtr<compressible::RASmodel> turbulence
+autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 424f032b2ef7ce1faf4108d1ed958501ef2097b7..ea2724744a6af6328369130be5748c23274cf0a5 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "hCombustionThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "chemistryModel.H"
#include "chemistrySolver.H"
#include "multivariateScheme.H"
diff --git a/applications/solvers/compressible/coodles/Make/options b/applications/solvers/compressible/coodles/Make/options
index 1bc6e360d0b0d188cf92481621d8fd8877c77914..9d53cd48199cc9363ad77f00ef1f83017f2e6533 100644
--- a/applications/solvers/compressible/coodles/Make/options
+++ b/applications/solvers/compressible/coodles/Make/options
@@ -10,4 +10,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleLESmodels
+ -lcompressibleLESModels
diff --git a/applications/solvers/compressible/coodles/coodles.C b/applications/solvers/compressible/coodles/coodles.C
index a8bc87061e0981cea82ecc63cb52cf400f77a52a..7eec8b4bfc710d4a9b72ffddde0c13b2a6e1635d 100644
--- a/applications/solvers/compressible/coodles/coodles.C
+++ b/applications/solvers/compressible/coodles/coodles.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/LESmodel/LESmodel.H"
+#include "compressible/LESModel/LESModel.H"
#define divDevRhoReff divDevRhoBeff
diff --git a/applications/solvers/compressible/coodles/createFields.H b/applications/solvers/compressible/coodles/createFields.H
index df29ac752bd18dfc074e3ad1c927682ba29baaea..5b02f0c4dbaca5cc34761343400380f1d681498c 100644
--- a/applications/solvers/compressible/coodles/createFields.H
+++ b/applications/solvers/compressible/coodles/createFields.H
@@ -40,9 +40,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::LESmodel> turbulence
+ autoPtr<compressible::LESModel> turbulence
(
- compressible::LESmodel::New(rho, U, phi, thermo())
+ compressible::LESModel::New(rho, U, phi, thermo())
);
Info<< "Creating field DpDt\n" << endl;
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options
index dcd95f76616244483d8063a50909a7ba82535646..c33e5a1da8d9f2bdaace0d3176e72b1ba941e8d1 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleRASmodels
+ -lcompressibleRASModels
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 4e2e34728e297af5eb07a7087bfb2bb63706953b..5704a66403df81470c266d247cce13c78f3cfe98 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -44,9 +44,9 @@
);
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 0e621d47731ed33d32a38e9eaa9bf1f58a66ded2..f08976d3b41721317caf635e5048b5c3fc16dd80 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -36,7 +36,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "fixedGradientFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
index 7325d5b42028dc21141dbd8331da2c91dc55452e..6d8c3fe27a17e33eee20b253f104df5a5e61e94c 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
@@ -10,4 +10,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleRASmodels
+ -lcompressibleRASModels
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
index 2ba7cbb0b907ddba1e1c3898d07ae9a708ef7bb7..eee3959a4e0850702aa4ef1a47052aece69971fb 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
@@ -49,9 +49,9 @@
);
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index d552558f146438b21b8d93ed8cc10a2e38d0d6d6..ca5898326813eb7d8ea418b53ce3438240a2ccef 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "porousZones.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options
index dcd95f76616244483d8063a50909a7ba82535646..c33e5a1da8d9f2bdaace0d3176e72b1ba941e8d1 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleRASmodels
+ -lcompressibleRASModels
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 45fc80e49707dab8fa9113cadf2245704e5e19cc..9c4f446c37ff45885232c1219825f8840fe9cbdb 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -49,9 +49,9 @@
);
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index c73d0ddfd5153494e19672e29d3ed3e5288eb80f..c0ba6cd42c75e3a0ea0ba58a841bb6466eb03320 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "fixedGradientFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoTurbFoam/Make/options b/applications/solvers/compressible/rhoTurbFoam/Make/options
index c28d6dac5f91b9801b8d243cd213e24ced0abdd9..e7f320c747302176ca996ecad955c69f6ee8bed7 100644
--- a/applications/solvers/compressible/rhoTurbFoam/Make/options
+++ b/applications/solvers/compressible/rhoTurbFoam/Make/options
@@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleRASmodels
+ -lcompressibleRASModels
diff --git a/applications/solvers/compressible/rhoTurbFoam/createFields.H b/applications/solvers/compressible/rhoTurbFoam/createFields.H
index bf6087a1a7413bdff0a3ab5951452bd869065751..a523aa36d58826b07eae48fdc0d70d35b243b410 100644
--- a/applications/solvers/compressible/rhoTurbFoam/createFields.H
+++ b/applications/solvers/compressible/rhoTurbFoam/createFields.H
@@ -40,9 +40,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/rhoTurbFoam/rhoTurbFoam.C b/applications/solvers/compressible/rhoTurbFoam/rhoTurbFoam.C
index 7231790ce544c78eaac051cf747dcbb88afdd40a..a5c60692ab6e4e2215b94fb66527469e256f9f3d 100644
--- a/applications/solvers/compressible/rhoTurbFoam/rhoTurbFoam.C
+++ b/applications/solvers/compressible/rhoTurbFoam/rhoTurbFoam.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/sonicTurbFoam/Make/options b/applications/solvers/compressible/sonicTurbFoam/Make/options
index ebdb2234e7cb5b8d73fb108416c9af1b630bc7fa..44a57f741c5e57d99b6f47115986c62ffab76424 100644
--- a/applications/solvers/compressible/sonicTurbFoam/Make/options
+++ b/applications/solvers/compressible/sonicTurbFoam/Make/options
@@ -7,6 +7,6 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
- -lcompressibleRASmodels \
+ -lcompressibleRASModels \
-lbasicThermophysicalModels \
-lspecie
diff --git a/applications/solvers/compressible/sonicTurbFoam/createFields.H b/applications/solvers/compressible/sonicTurbFoam/createFields.H
index acfb55a7f92aea123400467678098c6201f56079..d3cb63d212d99dbb6aa35facbebfd37cd160716d 100644
--- a/applications/solvers/compressible/sonicTurbFoam/createFields.H
+++ b/applications/solvers/compressible/sonicTurbFoam/createFields.H
@@ -38,9 +38,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/sonicTurbFoam/sonicTurbFoam.C b/applications/solvers/compressible/sonicTurbFoam/sonicTurbFoam.C
index 03d247c05408b8766ec0fbae8cccb6375792d0fb..1bfd8a4c6f125c3dd5f5cbe8b56b9adeb22de596 100644
--- a/applications/solvers/compressible/sonicTurbFoam/sonicTurbFoam.C
+++ b/applications/solvers/compressible/sonicTurbFoam/sonicTurbFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/heatTransfer/buoyantFoam/Make/options b/applications/solvers/heatTransfer/buoyantFoam/Make/options
index 0a3761fdc6601a371174ccbba206d02588c2bef3..f0695e5ccb6f4ac68e931088e8ed842032282c80 100644
--- a/applications/solvers/heatTransfer/buoyantFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantFoam/Make/options
@@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleRASmodels
+ -lcompressibleRASModels
diff --git a/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C b/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C
index 8e513e8b615b1a7fe84122f905869c107d04d086..54efa7f43819c4cd49da94f2ba1a9607806ab846 100644
--- a/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C
+++ b/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C
@@ -34,7 +34,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "fixedGradientFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/heatTransfer/buoyantFoam/createFields.H b/applications/solvers/heatTransfer/buoyantFoam/createFields.H
index b3a677f28f1841892117554898dad9f6711503be..99cb78bcacbf2c8ad175430fdc988a98a9f6c747 100644
--- a/applications/solvers/heatTransfer/buoyantFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantFoam/createFields.H
@@ -41,9 +41,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
index dcd95f76616244483d8063a50909a7ba82535646..c33e5a1da8d9f2bdaace0d3176e72b1ba941e8d1 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleRASmodels
+ -lcompressibleRASModels
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index fa2b66ae7f9fa8eea2ec7379cbd323a12bbffb5b..0a6e21de91ef15d0010b7239e0a48549a21f0abb 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "fixedGradientFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
index d93d63af0c9d1f07b2bcb5c81fc3bc2be2198e3e..1bdb4d874b86e6792ea858a186b385388ae6e3ec 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@@ -40,9 +40,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
index 54af7f6d9640d4f30186ebd5ed60e01043a9395e..9f865bc1b79bd7ef39fdf5dfd39cf0316302d04b 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
@@ -11,4 +11,4 @@ EXE_LIBS = \
-lbasicThermophysicalModels \
-lspecie \
-lradiation \
- -lcompressibleRASmodels
+ -lcompressibleRASModels
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index 621d2a5cafd753c287a609d52bc9e37f245f2acf..41fd9127da38769c3c699ca1bbbb37ca0b5365c0 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "fixedGradientFvPatchFields.H"
#include "radiationModel.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H
index 499b31a18e4aaffb7319381afa5005db53fb7e6b..0cdc89f1175ee348bb66bb5be46b839c4fbe3fd7 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H
@@ -41,9 +41,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
index dc9d23c632682b2c22cf2ff0c1b7a77ae6263f50..5bcd3c4ef6b281aacf314c7df5b8d16814d0963c 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@@ -13,4 +13,4 @@ EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleRASmodels
+ -lcompressibleRASModels
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index 1ce7dbb29ea8202645c5d4b3e330844fecc0c538..37c729bdc2a0d425ce9adfed4b6bf03f80768534 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "fixedGradientFvPatchFields.H"
#include "regionProperties.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index a08912bf618cac9903b567a653617a94c36ef674..aec296a1b36138dc3c1dadb79197aa30a935dac4 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -4,7 +4,7 @@
PtrList<volScalarField> Kf(fluidRegions.size());
PtrList<volVectorField> Uf(fluidRegions.size());
PtrList<surfaceScalarField> phif(fluidRegions.size());
- PtrList<compressible::RASmodel> turb(fluidRegions.size());
+ PtrList<compressible::RASModel> turb(fluidRegions.size());
PtrList<volScalarField> DpDtf(fluidRegions.size());
PtrList<volScalarField> ghf(fluidRegions.size());
PtrList<volScalarField> pdf(fluidRegions.size());
@@ -125,9 +125,9 @@
turb.set
(
i,
- autoPtr<compressible::RASmodel>
+ autoPtr<compressible::RASModel>
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rhof[i],
Uf[i],
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveEnthalpyEquation.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveEnthalpyEquation.C
index ebd1d3284854d9f29f7fc784f701ef2191f6ec7f..f7894cf60736b5ba856b4585491488ddc958cb51 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveEnthalpyEquation.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveEnthalpyEquation.C
@@ -32,7 +32,7 @@ void solveEnthalpyEquation
const volScalarField& rho,
const volScalarField& DpDt,
const surfaceScalarField& phi,
- const compressible::RASmodel& turb,
+ const compressible::RASModel& turb,
basicThermo& thermo
)
{
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveMomentumEquation.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveMomentumEquation.C
index 69699675b16352c2e234c69592cb7252c8601206..4c1ffa598dc34c0abdbf1f72ef2855d31ff273f8 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveMomentumEquation.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveMomentumEquation.C
@@ -35,7 +35,7 @@ tmp<fvVectorMatrix> solveMomentumEquation
const surfaceScalarField& phi,
const volScalarField& pd,
const volScalarField& gh,
- const compressible::RASmodel& turb
+ const compressible::RASModel& turb
)
{
// Solve the Momentum equation
diff --git a/applications/solvers/heatTransfer/lesBuoyantFoam/Make/options b/applications/solvers/heatTransfer/lesBuoyantFoam/Make/options
index 2dc02308d79846de2c779bff5dd18d440f206f91..61a142792d9827f553320adf7f6dc7351cdc4155 100644
--- a/applications/solvers/heatTransfer/lesBuoyantFoam/Make/options
+++ b/applications/solvers/heatTransfer/lesBuoyantFoam/Make/options
@@ -10,4 +10,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleLESmodels
+ -lcompressibleLESModels
diff --git a/applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H b/applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H
index 612e3065c7f9c5b4d26851f5e739c86bcf8a7792..3fd85b36c5a20f77a5836d4dcd61fbe1d822ba80 100644
--- a/applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H
+++ b/applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H
@@ -41,9 +41,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::LESmodel> turbulence
+ autoPtr<compressible::LESModel> turbulence
(
- compressible::LESmodel::New(rho, U, phi, thermo())
+ compressible::LESModel::New(rho, U, phi, thermo())
);
diff --git a/applications/solvers/heatTransfer/lesBuoyantFoam/lesBuoyantFoam.C b/applications/solvers/heatTransfer/lesBuoyantFoam/lesBuoyantFoam.C
index 1868d0322e71e79805520373c79b8bd432b78745..2fb12573fb9603cf324ea5be451f8df4df406a67 100644
--- a/applications/solvers/heatTransfer/lesBuoyantFoam/lesBuoyantFoam.C
+++ b/applications/solvers/heatTransfer/lesBuoyantFoam/lesBuoyantFoam.C
@@ -34,7 +34,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/LESmodel/LESmodel.H"
+#include "compressible/LESModel/LESModel.H"
#define divDevRhoReff divDevRhoBeff
diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options
index 73c556dcf0f3c9d6fb97737fe527b37c8875d634..835189da6d15adf109236ff60d167950ec01013e 100644
--- a/applications/solvers/incompressible/boundaryFoam/Make/options
+++ b/applications/solvers/incompressible/boundaryFoam/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
- -lincompressibleRASmodels \
+ -lincompressibleRASModels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools \
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index e51c47e5f1eb64aa300dc429c98ed7589ba34b6d..850d63f5667b888f019cc2a5f11304bf18c4af4e 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -38,7 +38,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
#include "wallFvPatch.H"
#include "makeGraph.H"
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index 3a1624e6effd65c5edd1d89facd3689b5896d9f9..b7b8b32229a59698e4dc19f74133f8cbbb3c7aa5 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -31,9 +31,9 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::RASmodel> turbulence
+ autoPtr<incompressible::RASModel> turbulence
(
- incompressible::RASmodel::New(U, phi, laminarTransport)
+ incompressible::RASModel::New(U, phi, laminarTransport)
);
diff --git a/applications/solvers/incompressible/channelOodles/Make/options b/applications/solvers/incompressible/channelOodles/Make/options
index 5f39a2f09344ce15ae9f1e54d1f77324fcee32df..7f55ccc3ed7c907e7147963f6ad0c3a6aeefe903 100644
--- a/applications/solvers/incompressible/channelOodles/Make/options
+++ b/applications/solvers/incompressible/channelOodles/Make/options
@@ -7,7 +7,7 @@ EXE_INC = \
-I../oodles
EXE_LIBS = \
- -lincompressibleLESmodels \
+ -lincompressibleLESModels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools
diff --git a/applications/solvers/incompressible/channelOodles/channelOodles.C b/applications/solvers/incompressible/channelOodles/channelOodles.C
index b4b73741fcc874fb80b42e0c5d86287c028018f6..f0d3d2b8d8be82af571290d2109d2c6a9731dd6a 100644
--- a/applications/solvers/incompressible/channelOodles/channelOodles.C
+++ b/applications/solvers/incompressible/channelOodles/channelOodles.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/LESmodel/LESmodel.H"
+#include "incompressible/LESModel/LESModel.H"
#include "IFstream.H"
#include "OFstream.H"
#include "Random.H"
diff --git a/applications/solvers/incompressible/channelOodles/createFields.H b/applications/solvers/incompressible/channelOodles/createFields.H
index 26559fcb1a5aaf4b1781d499eccaf4216fbeee46..7099762cc2fbd844e4588b22da0cdd16fa6dc44c 100644
--- a/applications/solvers/incompressible/channelOodles/createFields.H
+++ b/applications/solvers/incompressible/channelOodles/createFields.H
@@ -37,7 +37,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::LESmodel> sgsModel
+ autoPtr<incompressible::LESModel> sgsModel
(
- incompressible::LESmodel::New(U, phi, laminarTransport)
+ incompressible::LESModel::New(U, phi, laminarTransport)
);
diff --git a/applications/solvers/incompressible/oodles/Make/options b/applications/solvers/incompressible/oodles/Make/options
index 38a50d776688f78c1c7a82a5f486e05035d768ad..dd71fa8e53a4f808961209b9fc65895bf9aec1af 100644
--- a/applications/solvers/incompressible/oodles/Make/options
+++ b/applications/solvers/incompressible/oodles/Make/options
@@ -7,7 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
- -lincompressibleLESmodels \
+ -lincompressibleLESModels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools
diff --git a/applications/solvers/incompressible/oodles/createFields.H b/applications/solvers/incompressible/oodles/createFields.H
index 26559fcb1a5aaf4b1781d499eccaf4216fbeee46..7099762cc2fbd844e4588b22da0cdd16fa6dc44c 100644
--- a/applications/solvers/incompressible/oodles/createFields.H
+++ b/applications/solvers/incompressible/oodles/createFields.H
@@ -37,7 +37,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::LESmodel> sgsModel
+ autoPtr<incompressible::LESModel> sgsModel
(
- incompressible::LESmodel::New(U, phi, laminarTransport)
+ incompressible::LESModel::New(U, phi, laminarTransport)
);
diff --git a/applications/solvers/incompressible/oodles/oodles.C b/applications/solvers/incompressible/oodles/oodles.C
index 883eefe9e6dc84935beb3b6fe64be93d61abcc91..348b1f2f9f1e37c490e9cabc499957fea221b160 100644
--- a/applications/solvers/incompressible/oodles/oodles.C
+++ b/applications/solvers/incompressible/oodles/oodles.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/transportModel/transportModel.H"
-#include "incompressible/LESmodel/LESmodel.H"
+#include "incompressible/LESModel/LESModel.H"
#include "IFstream.H"
#include "OFstream.H"
#include "Random.H"
diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options
index c1232be74c2f0199c7998c84ee4b10e241504923..e1ffa287732d80b41bb08082b41b67556a286165 100644
--- a/applications/solvers/incompressible/simpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
- -lincompressibleRASmodels \
+ -lincompressibleRASModels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools \
diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H
index 3cf08533706db57691340a784f5936ec8380b87d..ab424962554bd77646d7f5e4abe151c927f091c1 100644
--- a/applications/solvers/incompressible/simpleFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleFoam/createFields.H
@@ -36,7 +36,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::RASmodel> turbulence
+ autoPtr<incompressible::RASModel> turbulence
(
- incompressible::RASmodel::New(U, phi, laminarTransport)
+ incompressible::RASModel::New(U, phi, laminarTransport)
);
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index 6f8788516353022a77392ab6f605291d406c4f21..9c0eac2a46617477bf953def4488ccf246ef2c77 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/incompressible/turbDyMFoam/Make/options b/applications/solvers/incompressible/turbDyMFoam/Make/options
index 53b2a61605dcded887b42bb3ec71fa8270ed5da9..898b42d16adc81750a17109796a658200617241d 100644
--- a/applications/solvers/incompressible/turbDyMFoam/Make/options
+++ b/applications/solvers/incompressible/turbDyMFoam/Make/options
@@ -10,6 +10,6 @@ EXE_LIBS = \
-ldynamicFvMesh \
-ldynamicMesh \
-lmeshTools \
- -lincompressibleRASmodels \
+ -lincompressibleRASModels \
-lincompressibleTransportModels \
-lfiniteVolume
diff --git a/applications/solvers/incompressible/turbDyMFoam/createFields.H b/applications/solvers/incompressible/turbDyMFoam/createFields.H
index 2879da8e103f59cdbc0e7844045c82e826e24b46..1bbcd330ce1c10730a7f4a1e57621e19176a1b2d 100644
--- a/applications/solvers/incompressible/turbDyMFoam/createFields.H
+++ b/applications/solvers/incompressible/turbDyMFoam/createFields.H
@@ -37,9 +37,9 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::RASmodel> turbulence
+ autoPtr<incompressible::RASModel> turbulence
(
- incompressible::RASmodel::New(U, phi, laminarTransport)
+ incompressible::RASModel::New(U, phi, laminarTransport)
);
Info<< "Reading field rAU if present\n" << endl;
diff --git a/applications/solvers/incompressible/turbDyMFoam/turbDyMFoam.C b/applications/solvers/incompressible/turbDyMFoam/turbDyMFoam.C
index db8496d0772e0196c4f6023c8b8921fe373cf50b..3ce4f5b4506b8a6083e5b7f47659f77efd0d6e84 100644
--- a/applications/solvers/incompressible/turbDyMFoam/turbDyMFoam.C
+++ b/applications/solvers/incompressible/turbDyMFoam/turbDyMFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
#include "dynamicFvMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/incompressible/turbFoam/Make/options b/applications/solvers/incompressible/turbFoam/Make/options
index 4c0e0228c1d6ac59e8fad168bd822c9d9ced439a..e8bf7df237d5845a1a7b087d6a92cbd3273f09a5 100644
--- a/applications/solvers/incompressible/turbFoam/Make/options
+++ b/applications/solvers/incompressible/turbFoam/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lincompressibleRASmodels \
+ -lincompressibleRASModels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools
diff --git a/applications/solvers/incompressible/turbFoam/createFields.H b/applications/solvers/incompressible/turbFoam/createFields.H
index 82ba461ef8b9be7c6dac624006928f9d6888a51c..8bcbfe7a75e9c31fa28f50c5393ed7d24887e131 100644
--- a/applications/solvers/incompressible/turbFoam/createFields.H
+++ b/applications/solvers/incompressible/turbFoam/createFields.H
@@ -36,7 +36,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::RASmodel> turbulence
+ autoPtr<incompressible::RASModel> turbulence
(
- incompressible::RASmodel::New(U, phi, laminarTransport)
+ incompressible::RASModel::New(U, phi, laminarTransport)
);
diff --git a/applications/solvers/incompressible/turbFoam/turbFoam.C b/applications/solvers/incompressible/turbFoam/turbFoam.C
index e67f5ee48e075df564fe830d5dc5831909e1219c..799b4e67f8dadced424703c9204653188355eb8d 100644
--- a/applications/solvers/incompressible/turbFoam/turbFoam.C
+++ b/applications/solvers/incompressible/turbFoam/turbFoam.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/bubbleFoam/createFields.H b/applications/solvers/multiphase/bubbleFoam/createFields.H
index 469c15cae62d0d85882242ed62b8d9f841dc4323..875a4f1be13550588c393b2d52e17a19e3990a4a 100644
--- a/applications/solvers/multiphase/bubbleFoam/createFields.H
+++ b/applications/solvers/multiphase/bubbleFoam/createFields.H
@@ -157,7 +157,7 @@
);
-# include "createTurbulence.H"
+# include "createRASTurbulence.H"
Info<< "Calculating field DDtUa and DDtUb\n" << endl;
diff --git a/applications/solvers/multiphase/bubbleFoam/createTurbulence.H b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
similarity index 90%
rename from applications/solvers/multiphase/bubbleFoam/createTurbulence.H
rename to applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
index 347fa1168e86a82a10ea771c0094dc00a9028a41..9eb468f91640b49248c7de8f01af8c397a7eeb1d 100644
--- a/applications/solvers/multiphase/bubbleFoam/createTurbulence.H
+++ b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
@@ -1,8 +1,8 @@
- IOdictionary turbulenceProperties
+ IOdictionary RASProperties
(
IOobject
(
- "turbulenceProperties",
+ "RASProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
@@ -13,12 +13,12 @@
Switch turbulence
(
- turbulenceProperties.lookup("turbulence")
+ RASProperties.lookup("turbulence")
);
dictionary kEpsilonCoeffs
(
- turbulenceProperties.subDict("kEpsilonCoeffs")
+ RASProperties.subDict("kEpsilonCoeffs")
);
@@ -49,7 +49,7 @@
dictionary wallFunctionCoeffs
(
- turbulenceProperties.subDict("wallFunctionCoeffs")
+ RASProperties.subDict("wallFunctionCoeffs")
);
scalar kappa
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/Make/options b/applications/solvers/multiphase/compressibleLesInterFoam/Make/options
index acc310726a87b0bf4db32101fb85768d46a03620..45e4e10f670cd864e3619f1cd6920ac748b57849 100644
--- a/applications/solvers/multiphase/compressibleLesInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleLesInterFoam/Make/options
@@ -11,5 +11,5 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
- -lincompressibleLESmodels \
+ -lincompressibleLESModels \
-lfiniteVolume
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/compressibleLesInterFoam.C b/applications/solvers/multiphase/compressibleLesInterFoam/compressibleLesInterFoam.C
index 6a7874f1968fab4e166c394b5fcfad0aa6adbafc..14ef963e8b3ffd1ef8a5b33e8612fd069dc01a2c 100644
--- a/applications/solvers/multiphase/compressibleLesInterFoam/compressibleLesInterFoam.C
+++ b/applications/solvers/multiphase/compressibleLesInterFoam/compressibleLesInterFoam.C
@@ -39,7 +39,7 @@ Description
#include "subCycle.H"
#include "interfaceProperties.H"
#include "twoPhaseMixture.H"
-#include "incompressible/LESmodel/LESmodel.H"
+#include "incompressible/LESModel/LESModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/createFields.H b/applications/solvers/multiphase/compressibleLesInterFoam/createFields.H
index 4b1012b850f5b230959882349970a59380c07837..c6dd6c0f48a62b428e9748e8cfee5447652150a1 100644
--- a/applications/solvers/multiphase/compressibleLesInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleLesInterFoam/createFields.H
@@ -146,7 +146,7 @@
interfaceProperties interface(alpha1, U, twoPhaseProperties);
// Construct LES model
- autoPtr<incompressible::LESmodel> turbulence
+ autoPtr<incompressible::LESModel> turbulence
(
- incompressible::LESmodel::New(U, phi, twoPhaseProperties)
+ incompressible::LESModel::New(U, phi, twoPhaseProperties)
);
diff --git a/applications/solvers/multiphase/interDyMFoam/Make/options b/applications/solvers/multiphase/interDyMFoam/Make/options
index 7b811aa97d93c37173bf7821aac686db3604a51b..24d71bc7eef685c58a101c45c0e2de9f6936b9b0 100644
--- a/applications/solvers/multiphase/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interDyMFoam/Make/options
@@ -13,7 +13,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
- -lincompressibleRASmodels \
+ -lincompressibleRASModels \
-lfiniteVolume \
-ldynamicMesh \
-lmeshTools \
diff --git a/applications/solvers/multiphase/interDyMFoam/createFields.H b/applications/solvers/multiphase/interDyMFoam/createFields.H
index 43e3f82af82a49b16afdd2810f913005d5331c06..ab58050ed0c61802baf7af3410798ad5193159d4 100644
--- a/applications/solvers/multiphase/interDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/interDyMFoam/createFields.H
@@ -87,9 +87,9 @@
interfaceProperties interface(gamma, U, twoPhaseProperties);
// Construct incompressible RAS model
- autoPtr<incompressible::RASmodel> turbulence
+ autoPtr<incompressible::RASModel> turbulence
(
- incompressible::RASmodel::New(U, phi, twoPhaseProperties)
+ incompressible::RASModel::New(U, phi, twoPhaseProperties)
);
wordList pcorrTypes(pd.boundaryField().types());
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index c10bdf64de79e24e28fa49e51271c43ea2a8b26e..73b2c13c85094557c99ec39aa0372eb921da1321 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -39,7 +39,7 @@ Description
#include "subCycle.H"
#include "interfaceProperties.H"
#include "twoPhaseMixture.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
#include "probes.H"
#include "EulerDdtScheme.H"
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
index af6ebd0be3d535749fb7b1811ee5c7c03a9c8121..fa6943e580b322ca8892655081bfe4448f634122 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
@@ -10,5 +10,5 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
- -lincompressibleLESmodels \
+ -lincompressibleLESModels \
-lfiniteVolume
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
index 1fba42a1c29e94440ea3148916aae9449739ee2b..9e9c68a89075cebe558f42ba5d2f9e8012f8400b 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
@@ -92,7 +92,7 @@
interfaceProperties interface(gamma, U, twoPhaseProperties());
// Construct LES model
- autoPtr<incompressible::LESmodel> turbulence
+ autoPtr<incompressible::LESModel> turbulence
(
- incompressible::LESmodel::New(U, phi, twoPhaseProperties())
+ incompressible::LESModel::New(U, phi, twoPhaseProperties())
);
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index b57c02a8cb3ba62800cd562c3ca0fbca998bf834..c202f5d3dbe3da7fb873296cadcdd556af32bfe3 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -42,7 +42,7 @@ Description
#include "subCycle.H"
#include "interfaceProperties.H"
#include "phaseChangeTwoPhaseMixture.H"
-#include "incompressible/LESmodel/LESmodel.H"
+#include "incompressible/LESModel/LESModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/Make/options b/applications/solvers/multiphase/lesCavitatingFoam/Make/options
index 988b21f834e3045ebb84ffc750cff1ce224de830..91833c1365820ef6d68fe5c2c52bb469af717517 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/lesCavitatingFoam/Make/options
@@ -10,7 +10,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTransportModels \
- -lincompressibleLESmodels \
+ -lincompressibleLESModels \
-lfiniteVolume \
-lbarotropicCompressibilityModel
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/createFields.H b/applications/solvers/multiphase/lesCavitatingFoam/createFields.H
index 7590df3f59b035411155bd3bcd984eccc5b3acab..d2e19bcae8905ed27ba220f9443e5b5146bd3322 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/lesCavitatingFoam/createFields.H
@@ -79,7 +79,7 @@
twoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
// Create LES model
- autoPtr<incompressible::LESmodel> turbulence
+ autoPtr<incompressible::LESModel> turbulence
(
- incompressible::LESmodel::New(U, phiv, twoPhaseProperties)
+ incompressible::LESModel::New(U, phiv, twoPhaseProperties)
);
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C
index 9d6c4690dbbf7ed1d140abdc911dc31ee91dbed4..1a36f6f448653a1491bfc83c39e7c4e52ae4dfc8 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C
+++ b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C
@@ -33,13 +33,13 @@ namespace Foam
{
namespace incompressible
{
-namespace LES
+namespace LESModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(devOneEqEddy, 0);
-addToRunTimeSelectionTable(LESmodel, devOneEqEddy, dictionary);
+addToRunTimeSelectionTable(LESModel, devOneEqEddy, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -50,7 +50,7 @@ devOneEqEddy::devOneEqEddy
transportModel& transport
)
:
- LESmodel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport),
GenEddyVisc(U, phi, transport),
k_
@@ -65,8 +65,15 @@ devOneEqEddy::devOneEqEddy
),
mesh_
),
-
- ck_(LESmodelProperties().lookupOrAddDefault("ck", 0.07))
+ ck_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "ck",
+ coeffDict(),
+ 0.07
+ )
+ )
{
printCoeffs();
}
@@ -103,7 +110,7 @@ bool devOneEqEddy::read()
{
if (GenEddyVisc::read())
{
- LESmodelProperties().readIfPresent<scalar>("ck", ck_);
+ ck_.readIfPresent(coeffDict());
return true;
}
@@ -116,7 +123,7 @@ bool devOneEqEddy::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LES
+} // End namespace LESModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H
index 5d4408f970791ed6920cd036e62d14f721e9c8a6..608e412522eabc60f34cd5e11571532338fa0103 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H
+++ b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H
@@ -63,7 +63,7 @@ namespace Foam
{
namespace incompressible
{
-namespace LES
+namespace LESModels
{
/*---------------------------------------------------------------------------*\
@@ -78,7 +78,7 @@ class devOneEqEddy
volScalarField k_;
- scalar ck_;
+ dimensionedScalar ck_;
// Private Member Functions
@@ -137,7 +137,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LESModelsModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C
index 31f5b90e137491d94ef3cf65759405a8f964fa39..0fa33be312389a691b2943fa4e69f5a5737311b7 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C
+++ b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "barotropicCompressibilityModel.H"
#include "twoPhaseMixture.H"
-#include "incompressible/LESmodel/LESmodel.H"
+#include "incompressible/LESModel/LESModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/lesInterFoam/Make/options b/applications/solvers/multiphase/lesInterFoam/Make/options
index 3c761572bf6f22bd855df9146b24f553a0ca4561..43c523e2203c09617871967797c56f3620d3294d 100644
--- a/applications/solvers/multiphase/lesInterFoam/Make/options
+++ b/applications/solvers/multiphase/lesInterFoam/Make/options
@@ -11,5 +11,5 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
- -lincompressibleLESmodels \
+ -lincompressibleLESModels \
-lfiniteVolume
diff --git a/applications/solvers/multiphase/lesInterFoam/createFields.H b/applications/solvers/multiphase/lesInterFoam/createFields.H
index ae8ec03a593141527fceadf44884ebced4657d88..c622be15611318d38b9509cd70c38fc84ef00269 100644
--- a/applications/solvers/multiphase/lesInterFoam/createFields.H
+++ b/applications/solvers/multiphase/lesInterFoam/createFields.H
@@ -109,7 +109,7 @@
interfaceProperties interface(gamma, U, twoPhaseProperties);
// Construct LES model
- autoPtr<incompressible::LESmodel> turbulence
+ autoPtr<incompressible::LESModel> turbulence
(
- incompressible::LESmodel::New(U, phi, twoPhaseProperties)
+ incompressible::LESModel::New(U, phi, twoPhaseProperties)
);
diff --git a/applications/solvers/multiphase/lesInterFoam/lesInterFoam.C b/applications/solvers/multiphase/lesInterFoam/lesInterFoam.C
index acb11e1b294a2e2426def305f29f2c4626fb6f9b..c33be33b244701d67204536c4c236321fc95d77e 100644
--- a/applications/solvers/multiphase/lesInterFoam/lesInterFoam.C
+++ b/applications/solvers/multiphase/lesInterFoam/lesInterFoam.C
@@ -39,7 +39,7 @@ Description
#include "subCycle.H"
#include "interfaceProperties.H"
#include "twoPhaseMixture.H"
-#include "incompressible/LESmodel/LESmodel.H"
+#include "incompressible/LESModel/LESModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/Make/options b/applications/solvers/multiphase/rasCavitatingFoam/Make/options
index 0450978390fc15aed2c32f21fe83c59dd0f6819b..a694ac21793d0dd9ec9b12747cef7f8de9e9d066 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/rasCavitatingFoam/Make/options
@@ -8,7 +8,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTransportModels \
- -lincompressibleRASmodels \
+ -lincompressibleRASModels \
-lfiniteVolume \
-lbarotropicCompressibilityModel
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/createFields.H b/applications/solvers/multiphase/rasCavitatingFoam/createFields.H
index ef416c1ca0ea873065c613e3eb8288d8d0a269ac..37ff01d41f6101fb7723cc3ee5f425573e419c6d 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/rasCavitatingFoam/createFields.H
@@ -79,7 +79,7 @@
twoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
// Create RAS turbulence model
- autoPtr<incompressible::RASmodel> turbulence
+ autoPtr<incompressible::RASModel> turbulence
(
- incompressible::RASmodel::New(U, phiv, twoPhaseProperties)
+ incompressible::RASModel::New(U, phiv, twoPhaseProperties)
);
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C b/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C
index 81d0e87b1e47b149b9419a27942d04b6f17c4f82..44780d0f6fc64f262ddc9cdffb3f15b7c6a2e0c6 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C
+++ b/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "barotropicCompressibilityModel.H"
#include "twoPhaseMixture.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/rasInterFoam/Make/options b/applications/solvers/multiphase/rasInterFoam/Make/options
index 9289b0f35eb004473552196c9bb9cc5d0fbb7409..04a3c57887c6c189dd005b3a86f50e570162fef2 100644
--- a/applications/solvers/multiphase/rasInterFoam/Make/options
+++ b/applications/solvers/multiphase/rasInterFoam/Make/options
@@ -9,5 +9,5 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
- -lincompressibleRASmodels \
+ -lincompressibleRASModels \
-lfiniteVolume
diff --git a/applications/solvers/multiphase/rasInterFoam/createFields.H b/applications/solvers/multiphase/rasInterFoam/createFields.H
index 0a3ffd255f9cb9a5766807c3858a22c08e48631f..e97a3abcb09cb52e0c407bf87a6dad94cf68291a 100644
--- a/applications/solvers/multiphase/rasInterFoam/createFields.H
+++ b/applications/solvers/multiphase/rasInterFoam/createFields.H
@@ -110,7 +110,7 @@
interfaceProperties interface(gamma, U, twoPhaseProperties);
// Construct LES model
- autoPtr<incompressible::RASmodel> turbulence
+ autoPtr<incompressible::RASModel> turbulence
(
- incompressible::RASmodel::New(U, phi, twoPhaseProperties)
+ incompressible::RASModel::New(U, phi, twoPhaseProperties)
);
diff --git a/applications/solvers/multiphase/rasInterFoam/rasInterFoam.C b/applications/solvers/multiphase/rasInterFoam/rasInterFoam.C
index ef1338ba0330658c3b99eb938822b6a546f667ae..93bce2ec05ff4d0e295608ad548baef1074db0e4 100644
--- a/applications/solvers/multiphase/rasInterFoam/rasInterFoam.C
+++ b/applications/solvers/multiphase/rasInterFoam/rasInterFoam.C
@@ -39,7 +39,7 @@ Description
#include "subCycle.H"
#include "interfaceProperties.H"
#include "twoPhaseMixture.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H
index dfc560135ec5d6e7452afa8c92e1fbd9756f6bd9..400f89c43bce66ce29f3d9cfe79e4a9cc84be9b3 100644
--- a/applications/solvers/multiphase/settlingFoam/createFields.H
+++ b/applications/solvers/multiphase/settlingFoam/createFields.H
@@ -210,11 +210,11 @@
- IOdictionary turbulenceProperties
+ IOdictionary RASProperties
(
IOobject
(
- "turbulenceProperties",
+ "RASProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
@@ -225,12 +225,12 @@
Switch turbulence
(
- turbulenceProperties.lookup("turbulence")
+ RASProperties.lookup("turbulence")
);
const dictionary& kEpsilonCoeffs
(
- turbulenceProperties.subDict("kEpsilonCoeffs")
+ RASProperties.subDict("kEpsilonCoeffs")
);
@@ -266,7 +266,7 @@
const dictionary& wallFunctionCoeffs
(
- turbulenceProperties.subDict("wallFunctionCoeffs")
+ RASProperties.subDict("wallFunctionCoeffs")
);
scalar kappa
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
index 7d70f4e57517d6fff495c570ac7b14927a95584c..1fdaf944bb4dcfa00a07a3c51fbe5e26ef69afb7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@@ -146,11 +146,11 @@
);
- IOdictionary turbulenceProperties
+ IOdictionary RASProperties
(
IOobject
(
- "turbulenceProperties",
+ "RASProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
@@ -161,12 +161,12 @@
Switch turbulence
(
- turbulenceProperties.lookup("turbulence")
+ RASProperties.lookup("turbulence")
);
dictionary kEpsilonCoeffs
(
- turbulenceProperties.subDict("kEpsilonCoeffs")
+ RASProperties.subDict("kEpsilonCoeffs")
);
@@ -197,7 +197,7 @@
dictionary wallFunctionCoeffs
(
- turbulenceProperties.subDict("wallFunctionCoeffs")
+ RASProperties.subDict("wallFunctionCoeffs")
);
scalar kappa
@@ -304,7 +304,7 @@
{
dragPhase = word(interfacialProperties.lookup("dragPhase"));
- bool validDrag =
+ bool validDrag =
dragPhase == "a" || dragPhase == "b" || dragPhase == "blended";
if (!validDrag)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index 06ff4ab40adac41d6705d2864d605ff927755c4a..b24240aeda8cd9cf9cb8b14116e79b7776264bf6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/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 =
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 881883c792c83aaa71bf306d4d043959d4f3f92f..b0949830f73df68ece35dac19fb7ebcc5f5110e7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/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 =
diff --git a/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.C
index f9c8526b7ec56d672670dfb50504637289e29eef..c4b57814eeabbfe962295036c5e8e7ea87ea117a 100644
--- a/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.H
index 3f61ffa7f0b0f62176c651fc2ac90b00529f74fe..f5e15a3cd61023991ad81e5a6e17da7d76c89a8f 100644
--- a/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.C
index 5d378a71e3414a6ecdd2ab55ca2ed15868a5f7c5..be33d51e48a338dcdaf0efcaf622e3ed93727a17 100644
--- a/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.C
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.H
index 1261f31de06918f243d7bbc6b89ec72bad67d7d0..4684f65c5089c1d8aa75b1f9283602233bca4dc1 100644
--- a/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.H
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.C
index 0c688e9ec028b1f248ed832c2b79647b3eda5028..72268bbc76dff39b6088ccf727310bb86e1a12a2 100644
--- a/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.C
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.H
index a848cd436bd892a419226d9e233375a1b35a159b..662b59a70dd2a3218092cd036ef2ff220a898798 100644
--- a/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.H
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C b/src/turbulenceModels/LES/compressible/LESModel/LESModel.C
similarity index 86%
rename from src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C
rename to src/turbulenceModels/LES/compressible/LESModel/LESModel.C
index f4677a15eff8478d05e6ec42aa14337d16ca5477..2105777b56d5ce8b6b770e5560c8ad0b325ed14a 100644
--- a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C
+++ b/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);
diff --git a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.H b/src/turbulenceModels/LES/compressible/LESModel/LESModel.H
similarity index 93%
rename from src/turbulenceModels/LES/compressible/LESmodel/LESmodel.H
rename to src/turbulenceModels/LES/compressible/LESModel/LESModel.H
index ed87427eaf32bd50f644e8d03f5b07c4d196b3ea..6f34e9fc50bbd4081957e0c3fddf72867d431fde 100644
--- a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.H
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/LESmodel/newLESmodel.C b/src/turbulenceModels/LES/compressible/LESModel/newLESModel.C
similarity index 82%
rename from src/turbulenceModels/LES/compressible/LESmodel/newLESmodel.C
rename to src/turbulenceModels/LES/compressible/LESModel/newLESModel.C
index 714e303d70f4824e1163fa5e983754375cc48f27..56803b15a80b33bfd7d92a790b2bdb7af72568b0 100644
--- a/src/turbulenceModels/LES/compressible/LESmodel/newLESmodel.C
+++ b/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));
}
diff --git a/src/turbulenceModels/LES/compressible/Make/files b/src/turbulenceModels/LES/compressible/Make/files
index a251f236da51224e437a1b52e7cbda1a78874b74..59ced1fae21556825e9154eb56abd763a2bb93e3 100644
--- a/src/turbulenceModels/LES/compressible/Make/files
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.C
index 151c95756d6fa8bc90a132e15d9283cce1998e36..77d67da01c8e1fe46dba155dac5f0199a683fa27 100644
--- a/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.C
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.H
index c50cc5b8aabc70ba8b36884d2dd92be7aa789bdf..da02a0e92f4a2806b1328a618e56398f62d5a785 100644
--- a/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.H
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.C
index ad155702cc559924373c6c6e074c3e120e503acc..61421a95e85015897db0cdde96c2221442281725 100644
--- a/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.H
index 71a875623d4a483afed93ae4aa476b16d5c7a366..58ad9717a87babd70ed6499fa800f815cfb86679 100644
--- a/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.C
index 0da469153e75e2114b74f1f051cdf816acea386b..e06316db1aafb55e6fa795e40521c2b983d2d1c6 100644
--- a/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.C
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.H
index 6c6ec6cc340e3ab2816f3367bce8b83ab0ec0d17..f3ff6c8ab027b160d37d8efd56f4bd283d4c4bc5 100644
--- a/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.H
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.C
index e31144f7abe5796de9c48664375f7336cb422302..f8739c160c7239a8bc205cdef745177b7cc87d80 100644
--- a/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.C
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.H b/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.H
index 2679bf32d104ae7e9ad032106a2a1d9cc1e72686..1ab69ede556f7a56fb3e2845723e23da84954ad6 100644
--- a/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.H
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.C
index 594587477de67e3fe517d6bb1a92f6cc95d4ad26..6183110adbf2e3da28f7a086373d92272c3213f9 100644
--- a/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.C
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.H
index 0043865925d88916a42648b867332fb1ec2c0d74..89f1f096d24c2c9a2ccb9e28941987ccf8251e6d 100644
--- a/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.H
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
index b5d47a573049b60dfe7d89b6c3961718e9a4b4c4..15199fb2d8368310bb9cf738c6ed2144b8464b44 100644
--- a/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
+++ b/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
diff --git a/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
index 7b2cc25e73a6edff3fcc27aeb5fd5f4ad726c4cd..9385b18bb86c58003acc43beb1a6d6bf30cac42c 100644
--- a/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C
index 2033b58532f00b3c5cdf6f763aacd3aef66b9b4e..267d7262fbda1b131c3be5d5766122a24c6cc696 100644
--- a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
index 4342ad5c4e2f5b47223f6e152523ca5a0d69effc..870abd98e9cadd3a4b00841aece40460988b4275 100644
--- a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C
index 21ff9ccbec243637a0628cb788943bd48828656d..7ebc0c4f82449dbbe0bca1db589ebb7435bccf7e 100644
--- a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H
index 694082f572c6f953f20dc6eb6a982a28049a1e79..14e0096ed656b7abccd8aa29d8aeeae5ada4fbea 100644
--- a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C
index 60be262ae7a037d402099a80af2c4bfbffdc8208..ea7c6cee616013d896aa99f2b456912e686d5f68 100644
--- a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H
index ee4d3fac69b570cfc7ebe43c1269074c148baee5..e736d03fb5475b90f5117965e4b0f5d8868a3bf7 100644
--- a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C b/src/turbulenceModels/LES/incompressible/LESModel/LESModel.C
similarity index 86%
rename from src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C
rename to src/turbulenceModels/LES/incompressible/LESModel/LESModel.C
index da8ae5e32d07121179703dbd47dcb1cd4baddf69..cd9005b2aff989b07a08e6d4648f9515c0e783fd 100644
--- a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C
+++ b/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);
diff --git a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.H b/src/turbulenceModels/LES/incompressible/LESModel/LESModel.H
similarity index 92%
rename from src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.H
rename to src/turbulenceModels/LES/incompressible/LESModel/LESModel.H
index 675903eba628a15dddf500ae560616591903f127..bed4e8b389b64d4ef7d20e45f4e6d657fae93b69 100644
--- a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/LESmodel/newLESmodel.C b/src/turbulenceModels/LES/incompressible/LESModel/newLESModel.C
similarity index 82%
rename from src/turbulenceModels/LES/incompressible/LESmodel/newLESmodel.C
rename to src/turbulenceModels/LES/incompressible/LESModel/newLESModel.C
index 0e74e07128547cffb57cf14a4443bc13adf15f99..c9e7ee19f4a54cf56bed5f7410b4dfc8987bc783 100644
--- a/src/turbulenceModels/LES/incompressible/LESmodel/newLESmodel.C
+++ b/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));
}
diff --git a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
index 8eafa12f9dfea066d9363bf9708d7d07d09dc577..ae1f4f96c55a329284eec306ec627cb190bd80cf 100644
--- a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H
index 0f0090459075de75d8e0f1800271848cb42f56bf..75c05865e2c2b7390a9de8d192bcca0bad454913 100644
--- a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/Make/files b/src/turbulenceModels/LES/incompressible/Make/files
index ca73bf2aebca338cbb4f4cb8c01218617220bd65..ed45e8ffbc58f27e523ffad567f7c2f2acf0e2d2 100644
--- a/src/turbulenceModels/LES/incompressible/Make/files
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C
index 91542aeca7a29537aaafee83b5e67b4fc7b5c389..d8508d6234ed9aea0ffc71ba9859a0bdec3bd321 100644
--- a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H
index a25851dc22ce2149595eef53995bdd24dff66a02..7f135b4b88efaa96ca594285c23fd65ae1e7cad6 100644
--- a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C
index 68b16b504325b9895815e1570939c564ae257b10..2d8399524bf4e677ab4fb32f4face89adac0e2b2 100644
--- a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H
index f47d85a7ce94668e92dc31787795601365208302..977e48356ff627e17799d97989dccb3f84e8f06f 100644
--- a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C
index 5efa320226294c0bd8f563bc2769ca1e6fb87f02..ad798f665ea97e16faa36d1b538a80ffbd125534 100644
--- a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H
index 1d173b6e43d4226c0ba6d20647e81245158c3ea3..d64a276be3f95bfae2d9dda9534f55492157d3b1 100644
--- a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C
index 5baf1277942da7c4420dd61710bfb59ff66b141b..642c9c6da1851d405085a08161910c090139de07 100644
--- a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
index 398b6a71e4a328a61975747940f2bbeb65badbf5..ce9f1340699071b23b410b261c749f19ec10164d 100644
--- a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C
index 98d187e81aa51872d7b21c7513ae0684a1a022c3..694306db1a89e106ebf50f2cc1f10e7121eaebfe 100644
--- a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H
index 9b57483fefb962f9b830b2f0ef8e971859385e41..75767ef9eee04ea52354bab00ee80a78a0f237b4 100644
--- a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C
index 822a30a4ba5160840284a37655405a1bfb398295..75ac1f89021f09bcca5932612c5a76dc236cc6d4 100644
--- a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H
index d4b88b737f71d0f5734c00ec7ce977e54c8d7b48..851b3450b29a9d1ecbcd03a6b365fab702a3b38f 100644
--- a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/laminar/laminar.C b/src/turbulenceModels/LES/incompressible/laminar/laminar.C
index 45585a69da57413197e3c261430ab12a85a35e50..2001e39a72109a4c192cb1791913ec05b33b2c01 100644
--- a/src/turbulenceModels/LES/incompressible/laminar/laminar.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/laminar/laminar.H b/src/turbulenceModels/LES/incompressible/laminar/laminar.H
index f6c2c31cc23704b1750321c0d7fefdbea21b708a..6410354396f263c1c3e823159e51d5466a82400d 100644
--- a/src/turbulenceModels/LES/incompressible/laminar/laminar.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C
index 520b12ff458712e9ba81fd3e291a12b1222cae6f..b80ed88e2784803717cbb906bc661b7710dae05e 100644
--- a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
index 3d62ca5e20195c637c0968bafff85cba077591f9..eb371257d144b16ee91314e4d18a9d5cfc8b631c 100644
--- a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C
index d08ba9425afad00b1983d6ac3b89a7d127a4474b..4d1698b0f3e2e4cd24f9ae2dfc4cd233ebdf9dc1 100644
--- a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
index 3fab843cf103efc1fe64c6e6adf1ab84b0008b79..9f6641a488e34eef6c0f1d0c503b9365d891461a 100644
--- a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C
index d27c0cc822262074afd39e25cd24528803dce391..17a28f17b71cc8ec502366d9cc3860e2867c3c2a 100644
--- a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H
index cc5f92a7df6d65ed569338cb78f5a55719269474..d78f8b6f57341e1b5ffd54d38045f7ffb47a5900 100644
--- a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C
index 0a5a5446157fbbb57a8308590d81d892f7ca54eb..2253611e9899538ead2a3f0d5589ce57dc9de447 100644
--- a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H
index 738e74896dab73351403653b9b667c90d573c7bc..aadb49ec94fbd87d3a45173582e29b5c158026ce 100644
--- a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C
index 83d49a438298a444b6cc4292eed0198ad830fdc7..cd09c466eb7241a5c6d29075fef6199bc8d956cf 100644
--- a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H
index 9bf67911d65c0cd6da82be1d21747c6490fa311c..bda2e66f7798c538f06ab31340476fa25028882d 100644
--- a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C
index b8d8467297973786bb87703e41aa8ac2fe685695..e5b89efd3aa17399a66e3be2b97456b32cc31cd9 100644
--- a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H
index 28de4b696ac07226443a4c6ebc1074e1c65e15cf..34805ee9438d7d3745be9df56ff083987500b8b1 100644
--- a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
index d2262d713323d55fb889501b64e3aa5973ac09ad..47fd81a130bfbe95b90bae26105fcff02773a0f4 100644
--- a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
+++ b/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
diff --git a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
index ef464406d6c62e7ed2b104ff0fb09ba8ca55ad81..81b4e74a594bdc0929ccc17c979ff25bef71d1ad 100644
--- a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/LRR/LRR.C b/src/turbulenceModels/RAS/compressible/LRR/LRR.C
index 9975a7cbc468f26469dee66362d085bd827c2293..8aceebda03e33f22e2d4e5e0911bd5e3d7a4a048 100644
--- a/src/turbulenceModels/RAS/compressible/LRR/LRR.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/LRR/LRR.H b/src/turbulenceModels/RAS/compressible/LRR/LRR.H
index 036b7fa0f24afb6a461d433a282a4b518ba3666f..ad2d9df8f4d395e08349a8f092168e3557c084e8 100644
--- a/src/turbulenceModels/RAS/compressible/LRR/LRR.H
+++ b/src/turbulenceModels/RAS/compressible/LRR/LRR.H
@@ -56,7 +56,7 @@ SourceFiles
#ifndef compressibleLRR_H
#define compressibleLRR_H
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -64,7 +64,7 @@ namespace Foam
{
namespace compressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -73,7 +73,7 @@ namespace RAS
class LRR
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -190,7 +190,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 8c6a500f264c0073fa0a462a17eb926d01e76081..0e2447373a5eae3e1ad36fd359af23f6e73003e4 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/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_);
-
- couplingFactor_.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(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
diff --git a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 5417949d5e02b1bae319ed463eab34103232a567..8457e178d0a54f59e37f5fed00faae100008f07b 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -57,7 +57,7 @@ SourceFiles
#ifndef compressibleLaunderGibsonRSTM_H
#define compressibleLaunderGibsonRSTM_H
-#include "RASmodel.H"
+#include "RASModel.H"
#include "wallDistReflection.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,7 +66,7 @@ namespace Foam
{
namespace compressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -75,7 +75,7 @@ namespace RAS
class LaunderGibsonRSTM
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -199,7 +199,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C
index 29e889df693c304f50fd3eddcfde77111c649afc..1002d5a2dc4a0106e59a11d597492762e44dbe59 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
index 4de6eb20f4794656ee54907b13f341747df445ec..ec1a66e09f2a198c39273c45fa1880256bf8e2db 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
@@ -52,7 +52,7 @@ SourceFiles
#ifndef compressibleLaunderSharmaKE_H
#define compressibleLaunderSharmaKE_H
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +60,7 @@ namespace Foam
{
namespace compressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace RAS
class LaunderSharmaKE
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -180,7 +180,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/compressible/Make/files b/src/turbulenceModels/RAS/compressible/Make/files
index 1b5a588bdb25a1788f58264c629f4d5c8a49b879..a04a7a9c0bc29d365fc55fd0488c2927f55e777c 100644
--- a/src/turbulenceModels/RAS/compressible/Make/files
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C b/src/turbulenceModels/RAS/compressible/RASModel/RASModel.C
similarity index 87%
rename from src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C
rename to src/turbulenceModels/RAS/compressible/RASModel/RASModel.C
index b91f2fe3eceec8375d4388f11033c54713fb6e3e..6a4a6c055b62170f983195e5810eb3cc96efbb04 100644
--- a/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C
+++ b/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_);
diff --git a/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.H b/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
similarity index 93%
rename from src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.H
rename to src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
index 42a5f432a56b85f4459d83634cdc192e8ace49e3..f18bfe5cd4bd153b0710206ae1c7a1a57814bb43 100644
--- a/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.H
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/RASmodel/newRASmodel.C b/src/turbulenceModels/RAS/compressible/RASModel/newRASModel.C
similarity index 81%
rename from src/turbulenceModels/RAS/compressible/RASmodel/newRASmodel.C
rename to src/turbulenceModels/RAS/compressible/RASModel/newRASModel.C
index ca151329abb4fa06bff951c25d92cd3b9b1355fc..f57989b5fe5482a26509085db485b34d824a17d0 100644
--- a/src/turbulenceModels/RAS/compressible/RASmodel/newRASmodel.C
+++ b/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)
);
diff --git a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C
index 45f5179091ee7828554cbb5088d109e7d13dc2fb..f1a24166771c09ea9fc28b4b89ebe0edb484e8ad 100644
--- a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
index 694ed16d58dbe29970eaa39354a5392a2b61b8a3..38d66ad0c715c3ad2be729da05329f7ef8b5f717 100644
--- a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
@@ -53,7 +53,7 @@ SourceFiles
#ifndef compressibleRNGkEpsilon_H
#define compressibleRNGkEpsilon_H
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -61,7 +61,7 @@ namespace Foam
{
namespace compressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -70,7 +70,7 @@ namespace RAS
class RNGkEpsilon
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -177,7 +177,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C
index aef71f2b7cc6f2412b37c06f0604cb08283eec79..edd8df4c30aa23767f284d48ce12886609ca228e 100644
--- a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
index 6c63645b398bc410f41505f6151826c826d2a63c..2a96baa02f5dbee7aff48d239ea887eb39ee25c1 100644
--- a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
@@ -68,7 +68,7 @@ SourceFiles
#ifndef compressibleSpalartAllmaras_H
#define combressibleSpalartAllmaras_H
-#include "RASmodel.H"
+#include "RASModel.H"
#include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -77,7 +77,7 @@ namespace Foam
{
namespace compressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -86,7 +86,7 @@ namespace RAS
class SpalartAllmaras
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -234,7 +234,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C
index 60e7c8d5c6ab270f2f56fe7edabaf675ab557561..ae26808856d0ca03f5c42efdd50443c1f0d69aaf 100644
--- a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
index 3a265d1f017ff3e38436e8dec0bcba309822bd95..521c722937aeb45e8449221c144ffcabdaf1eb48 100644
--- a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
@@ -51,7 +51,7 @@ SourceFiles
#ifndef compressiblekEpsilon_H
#define compressiblekEpsilon_H
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,7 +59,7 @@ namespace Foam
{
namespace compressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -68,7 +68,7 @@ namespace RAS
class kEpsilon
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -179,7 +179,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C
index fbe1823d17cff5be0779a01f78a5edf6e6bb978e..2e8a46a8004893c8cefebf9fb9ad266832f67cbe 100644
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
index 1023045de5562bbc95431587bce6902524e3e75c..7e321cc59462953b45b7851039d0393c6dad0d6d 100644
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
@@ -83,7 +83,7 @@ SourceFiles
#ifndef compressiblekOmegaSST_H
#define compressiblekOmegaSST_H
-#include "RASmodel.H"
+#include "RASModel.H"
#include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -92,7 +92,7 @@ namespace Foam
{
namespace compressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -101,7 +101,7 @@ namespace RAS
class kOmegaSST
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -291,7 +291,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/compressible/laminar/laminar.C b/src/turbulenceModels/RAS/compressible/laminar/laminar.C
index e325766e272068e86a01c52876474a168ef2ad11..08efbf715867ac200d60406c4c3692d77a1ded6c 100644
--- a/src/turbulenceModels/RAS/compressible/laminar/laminar.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/laminar/laminar.H b/src/turbulenceModels/RAS/compressible/laminar/laminar.H
index d9a3dd61fc320ccfbc852f0f3938899ba4c8f2ed..a123402f480cb4db3d8506fd2e0a174fa430d269 100644
--- a/src/turbulenceModels/RAS/compressible/laminar/laminar.H
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C
index 03da1cb1733a18c88578342c8d77cfb1d282f152..11a45f84959ed5fe481ca81743b07105c902cba0 100644
--- a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
index 44ba5cecf2204bda0f8a9d51db2a90fb58e1c649..510134ee6d5cb08847a81be3e2fa7d5afb67a20d 100644
--- a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
@@ -60,7 +60,7 @@ SourceFiles
#ifndef realizableKE_H
#define realizableKE_H
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,7 +68,7 @@ namespace Foam
{
namespace compressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -77,7 +77,7 @@ namespace RAS
class realizableKE
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -192,7 +192,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
index 487a50f696aa42581c4cfe9e3a827061cdf18cb3..5238bcda209369193ea7d04a48c006026dee49d6 100644
--- a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
index 516543d845bff00b6441b428c92b5cbbec957d89..bf469e34ff448ef7497c7222470838f88ed96bd5 100644
--- a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
+++ b/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
diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H b/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H
index 220a6a0e5ed716e42b2fd4acf948e61928663896..19ae89d4ca43042671e0cf80eaf707849294c89f 100644
--- a/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H
+++ b/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]);
}
}
}
diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H b/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H
index 8951fed140ca912245e760d38be6d0ed8c6fc313..938555e860675d50fc4c45758cdf1b49475737c9 100644
--- a/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H
+++ b/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_)
diff --git a/src/turbulenceModels/RAS/incompressible/LRR/LRR.C b/src/turbulenceModels/RAS/incompressible/LRR/LRR.C
index 3f8d0e45ab5b8b206649c79adc8805827ce6a763..0f7d3893a0e5c43ee2e59d5f014c189284bad084 100644
--- a/src/turbulenceModels/RAS/incompressible/LRR/LRR.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/incompressible/LRR/LRR.H b/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
index 3e7734c0654c17ebb85c89ebeae5717253b655c0..e61319364d2450943b07a1c6f127951afbe90423 100644
--- a/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
+++ b/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
@@ -55,7 +55,7 @@ SourceFiles
#ifndef LRR_H
#define LRR_H
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -63,7 +63,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -72,7 +72,7 @@ namespace RAS
class LRR
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -177,7 +177,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C
index 81ff51a0c65202ba1a58b2b3ebece3ff4ec7f942..ac52e5409a7eeeb82c7814d4a1cdf28924cbf519 100644
--- a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
index d8221221d3af9d146cf04b2373078084b2d20588..d1006ada6a55dc13f8ff6103585dd18ac80eb3c2 100644
--- a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
+++ b/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
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 1b5c69f14e588e8ba25033785500dfe07a267192..4b8c2d5c7b0fd42bae0a498d909f68a1998b4154 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/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_);
-
- couplingFactor_.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(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
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 5363eb18f63d337edb01a39eff26d51a4d0a1990..0bb147f3a545342d78075e4c6d288a6c8aba0138 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -56,7 +56,7 @@ SourceFiles
#ifndef LaunderGibsonRSTM_H
#define LaunderGibsonRSTM_H
-#include "RASmodel.H"
+#include "RASModel.H"
#include "wallDistReflection.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,7 +65,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -74,7 +74,7 @@ namespace RAS
class LaunderGibsonRSTM
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -185,7 +185,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C
index 9e5dc10e8de42c83b2a76a0d90475cf1cd7fdd35..fc2287784adc8a60918ccf6c9b4060c721cfd1a6 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
index a7a0575e6623b4efe7689f2698fa379d5bb91ca6..eb7a371d328b7f782492753078825fb26e305490 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
@@ -51,7 +51,7 @@ SourceFiles
#ifndef LaunderSharmaKE_H
#define LaunderSharmaKE_H
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,7 +59,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -68,7 +68,7 @@ namespace RAS
class LaunderSharmaKE
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -169,7 +169,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C
index 4d75357342969ef8aa31cca546b46330877bc794..5984f3c2136f1a6d37e2c254bfaa059c1c00b187 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C
+++ b/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
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
index 5eb92ef2150572b6ae78195ed8ae1fb3186718a2..17c03dd1445c84dbe3f8b2cf20973d3eb8d661bf 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
+++ b/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
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
index 429c16cbf6e3ee1d100ad298be106e631f47abe2..aa730e51260a43d9e1acca5ae2189f9b6de86ce2 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
@@ -34,13 +34,13 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LienCubicKELowRe, 0);
-addToRunTimeSelectionTable(RASmodel, LienCubicKELowRe, dictionary);
+addToRunTimeSelectionTable(RASModel, LienCubicKELowRe, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -52,14 +52,14 @@ LienCubicKELowRe::LienCubicKELowRe
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 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"C2",
- RASmodelCoeffs_,
+ coeffDict_,
1.92
)
),
@@ -77,7 +77,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"alphak",
- RASmodelCoeffs_,
+ coeffDict_,
1.0
)
),
@@ -86,7 +86,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"alphaEps",
- RASmodelCoeffs_,
+ coeffDict_,
0.76923
)
),
@@ -95,7 +95,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"A1",
- RASmodelCoeffs_,
+ coeffDict_,
1.25
)
),
@@ -104,7 +104,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"A2",
- RASmodelCoeffs_,
+ coeffDict_,
1000.0
)
),
@@ -113,7 +113,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"Ctau1",
- RASmodelCoeffs_,
+ coeffDict_,
-4.0
)
),
@@ -122,7 +122,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"Ctau2",
- RASmodelCoeffs_,
+ coeffDict_,
13.0
)
),
@@ -131,7 +131,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"Ctau3",
- RASmodelCoeffs_,
+ coeffDict_,
-2.0
)
),
@@ -140,7 +140,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"alphaKsi",
- RASmodelCoeffs_,
+ coeffDict_,
0.9
)
),
@@ -149,7 +149,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"Cmu",
- RASmodelCoeffs_,
+ coeffDict_,
0.09
)
),
@@ -158,7 +158,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"Am",
- RASmodelCoeffs_,
+ coeffDict_,
0.016
)
),
@@ -167,7 +167,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"Aepsilon",
- RASmodelCoeffs_,
+ coeffDict_,
0.263
)
),
@@ -176,7 +176,7 @@ LienCubicKELowRe::LienCubicKELowRe
dimensioned<scalar>::lookupOrAddToDict
(
"Amu",
- RASmodelCoeffs_,
+ coeffDict_,
0.00222
)
),
@@ -334,22 +334,22 @@ tmp<fvVectorMatrix> LienCubicKELowRe::divDevReff(volVectorField& U) const
bool LienCubicKELowRe::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_);
- CmuWall_.readIfPresent(RASmodelCoeffs_);
- Am_.readIfPresent(RASmodelCoeffs_);
- Aepsilon_.readIfPresent(RASmodelCoeffs_);
- Amu_.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_);
+ CmuWall_.readIfPresent(coeffDict_);
+ Am_.readIfPresent(coeffDict_);
+ Aepsilon_.readIfPresent(coeffDict_);
+ Amu_.readIfPresent(coeffDict_);
return true;
}
@@ -369,7 +369,7 @@ void LienCubicKELowRe::correct()
return;
}
- RASmodel::correct();
+ RASModel::correct();
if (mesh_.changing())
{
@@ -488,7 +488,7 @@ void LienCubicKELowRe::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
index 3ed165bce8776874e4d8b878907e29dceb7088c4..47edbe15e6c44166004174c43e29850769c50137 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
+++ b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
@@ -51,7 +51,7 @@ SourceFiles
#ifndef LienCubicKELowRe_H
#define LienCubicKELowRe_H
-#include "RASmodel.H"
+#include "RASModel.H"
#include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +60,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace RAS
class LienCubicKELowRe
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -187,7 +187,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // Edn namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index 119f7ca2628fb1ffb2b00ad4a3394a5089c51809..3a11a0c12e5fc2306cb7e32319045cca9fd19e65 100644
--- a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -34,13 +34,13 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LienLeschzinerLowRe, 0);
-addToRunTimeSelectionTable(RASmodel, LienLeschzinerLowRe, dictionary);
+addToRunTimeSelectionTable(RASModel, LienLeschzinerLowRe, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -52,22 +52,22 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
transportModel& lamTransportModel
)
:
- RASmodel(typeName, U, phi, lamTransportModel),
+ RASModel(typeName, U, phi, lamTransportModel),
- C1(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
- C2(RASmodelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
- alphak(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
+ C1(coeffDict_.lookupOrAddDefault<scalar>("C1", 1.44)),
+ C2(coeffDict_.lookupOrAddDefault<scalar>("C2", 1.92)),
+ alphak(coeffDict_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps
(
- RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
+ coeffDict_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
),
- Cmu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
- Am(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Am", 0.016)),
+ Cmu(coeffDict_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
+ Am(coeffDict_.lookupOrAddDefault<scalar>("Am", 0.016)),
Aepsilon
(
- RASmodelCoeffs_.lookupOrAddDefault<scalar>("Aepsilon", 0.263)
+ coeffDict_.lookupOrAddDefault<scalar>("Aepsilon", 0.263)
),
- Amu(RASmodelCoeffs_.lookupOrAddDefault<scalar>("Amu", 0.00222)),
+ Amu(coeffDict_.lookupOrAddDefault<scalar>("Amu", 0.00222)),
k_
(
@@ -168,16 +168,16 @@ tmp<fvVectorMatrix> LienLeschzinerLowRe::divDevReff(volVectorField& U) const
bool LienLeschzinerLowRe::read()
{
- if (RASmodel::read())
+ if (RASModel::read())
{
- RASmodelCoeffs_.readIfPresent<scalar>("C1", C1);
- RASmodelCoeffs_.readIfPresent<scalar>("C2", C2);
- RASmodelCoeffs_.readIfPresent<scalar>("alphak", alphak);
- RASmodelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
- RASmodelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
- RASmodelCoeffs_.readIfPresent<scalar>("Am", Am);
- RASmodelCoeffs_.readIfPresent<scalar>("Aepsilon", Aepsilon);
- RASmodelCoeffs_.readIfPresent<scalar>("Amu", Amu);
+ coeffDict_.readIfPresent<scalar>("C1", C1);
+ coeffDict_.readIfPresent<scalar>("C2", C2);
+ coeffDict_.readIfPresent<scalar>("alphak", alphak);
+ coeffDict_.readIfPresent<scalar>("alphaEps", alphaEps);
+ coeffDict_.readIfPresent<scalar>("Cmu", Cmu);
+ coeffDict_.readIfPresent<scalar>("Am", Am);
+ coeffDict_.readIfPresent<scalar>("Aepsilon", Aepsilon);
+ coeffDict_.readIfPresent<scalar>("Amu", Amu);
return true;
}
@@ -197,7 +197,7 @@ void LienLeschzinerLowRe::correct()
return;
}
- RASmodel::correct();
+ RASModel::correct();
if (mesh_.changing())
{
@@ -271,7 +271,7 @@ void LienLeschzinerLowRe::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
index 8ecbf8274432c012623038019d6e63edfbc08e0b..daee11d3d5aaea2edfb151e8edefe0568eb34241 100644
--- a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
+++ b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
@@ -37,7 +37,7 @@ SourceFiles
#ifndef LienLeschzinerLowRe_H
#define LienLeschzinerLowRe_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 LienLeschzinerLowRe
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -157,7 +157,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/Make/files b/src/turbulenceModels/RAS/incompressible/Make/files
index 7c0bba95c7d5afe67d931205e7b14edaebb67384..e1ee8f4c189de6fad67e41a73066c4678cfde93e 100644
--- a/src/turbulenceModels/RAS/incompressible/Make/files
+++ b/src/turbulenceModels/RAS/incompressible/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
@@ -20,4 +20,4 @@ wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField
wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
-LIB = $(FOAM_LIBBIN)/libincompressibleRASmodels
+LIB = $(FOAM_LIBBIN)/libincompressibleRASModels
diff --git a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C
index a798c2bc5290d21b5e2b910ca4248dd94b1c9395..d88d7195f3ddc4d059bc1e6eb0ef2516f4b303be 100644
--- a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C
@@ -34,13 +34,13 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(NonlinearKEShih, 0);
-addToRunTimeSelectionTable(RASmodel, NonlinearKEShih, dictionary);
+addToRunTimeSelectionTable(RASModel, NonlinearKEShih, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -52,14 +52,14 @@ NonlinearKEShih::NonlinearKEShih
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 @@ NonlinearKEShih::NonlinearKEShih
dimensioned<scalar>::lookupOrAddToDict
(
"C2",
- RASmodelCoeffs_,
+ coeffDict_,
1.92
)
),
@@ -77,7 +77,7 @@ NonlinearKEShih::NonlinearKEShih
dimensioned<scalar>::lookupOrAddToDict
(
"alphak",
- RASmodelCoeffs_,
+ coeffDict_,
1.0
)
),
@@ -86,7 +86,7 @@ NonlinearKEShih::NonlinearKEShih
dimensioned<scalar>::lookupOrAddToDict
(
"alphaEps",
- RASmodelCoeffs_,
+ coeffDict_,
0.76923
)
),
@@ -95,7 +95,7 @@ NonlinearKEShih::NonlinearKEShih
dimensioned<scalar>::lookupOrAddToDict
(
"A1",
- RASmodelCoeffs_,
+ coeffDict_,
1.25
)
),
@@ -104,7 +104,7 @@ NonlinearKEShih::NonlinearKEShih
dimensioned<scalar>::lookupOrAddToDict
(
"A2",
- RASmodelCoeffs_,
+ coeffDict_,
1000.0
)
),
@@ -113,7 +113,7 @@ NonlinearKEShih::NonlinearKEShih
dimensioned<scalar>::lookupOrAddToDict
(
"Ctau1",
- RASmodelCoeffs_,
+ coeffDict_,
-4.0
)
),
@@ -122,7 +122,7 @@ NonlinearKEShih::NonlinearKEShih
dimensioned<scalar>::lookupOrAddToDict
(
"Ctau2",
- RASmodelCoeffs_,
+ coeffDict_,
13.0
)
),
@@ -131,7 +131,7 @@ NonlinearKEShih::NonlinearKEShih
dimensioned<scalar>::lookupOrAddToDict
(
"Ctau3",
- RASmodelCoeffs_,
+ coeffDict_,
-2.0
)
),
@@ -140,7 +140,7 @@ NonlinearKEShih::NonlinearKEShih
dimensioned<scalar>::lookupOrAddToDict
(
"alphaKsi",
- RASmodelCoeffs_,
+ coeffDict_,
0.9
)
),
@@ -261,18 +261,18 @@ tmp<fvVectorMatrix> NonlinearKEShih::divDevReff(volVectorField& U) const
bool NonlinearKEShih::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;
}
@@ -292,7 +292,7 @@ void NonlinearKEShih::correct()
return;
}
- RASmodel::correct();
+ RASModel::correct();
gradU_ = fvc::grad(U_);
@@ -370,7 +370,7 @@ void NonlinearKEShih::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
index 149a8c2b15ec4863300f016ad74371a8339621b7..9c33979190cde18850bde820caae8a0f46cfcbd2 100644
--- a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
+++ b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
@@ -37,7 +37,7 @@ SourceFiles
#ifndef NonlinearKEShih_H
#define NonlinearKEShih_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 NonlinearKEShih
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -161,7 +161,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C
index 01263d9e8af40b4bc0b4751f1d26c40954af09a3..941c58fca534d0c2b50ba1bd24991ea521a03b88 100644
--- a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C
+++ b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C
@@ -33,13 +33,13 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(QZeta, 0);
-addToRunTimeSelectionTable(RASmodel, QZeta, dictionary);
+addToRunTimeSelectionTable(RASModel, QZeta, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@@ -77,14 +77,14 @@ QZeta::QZeta
transportModel& lamTransportModel
)
:
- RASmodel(typeName, U, phi, lamTransportModel),
+ RASModel(typeName, U, phi, lamTransportModel),
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
(
"Cmu",
- RASmodelCoeffs_,
+ coeffDict_,
0.09
)
),
@@ -93,7 +93,7 @@ QZeta::QZeta
dimensioned<scalar>::lookupOrAddToDict
(
"C1",
- RASmodelCoeffs_,
+ coeffDict_,
1.44
)
),
@@ -102,7 +102,7 @@ QZeta::QZeta
dimensioned<scalar>::lookupOrAddToDict
(
"C2",
- RASmodelCoeffs_,
+ coeffDict_,
1.92
)
),
@@ -111,7 +111,7 @@ QZeta::QZeta
dimensioned<scalar>::lookupOrAddToDict
(
"alphaZeta",
- RASmodelCoeffs_,
+ coeffDict_,
0.76923
)
),
@@ -120,7 +120,7 @@ QZeta::QZeta
Switch::lookupOrAddToDict
(
"anisotropic",
- RASmodelCoeffs_,
+ coeffDict_,
false
)
),
@@ -240,13 +240,13 @@ tmp<fvVectorMatrix> QZeta::divDevReff(volVectorField& U) const
bool QZeta::read()
{
- if (RASmodel::read())
+ if (RASModel::read())
{
- Cmu_.readIfPresent(RASmodelCoeffs_);
- C1_.readIfPresent(RASmodelCoeffs_);
- C2_.readIfPresent(RASmodelCoeffs_);
- alphaZeta_.readIfPresent(RASmodelCoeffs_);
- anisotropic_.readIfPresent("anisotropic", RASmodelCoeffs_);
+ Cmu_.readIfPresent(coeffDict_);
+ C1_.readIfPresent(coeffDict_);
+ C2_.readIfPresent(coeffDict_);
+ alphaZeta_.readIfPresent(coeffDict_);
+ anisotropic_.readIfPresent("anisotropic", coeffDict_);
return true;
}
@@ -266,7 +266,7 @@ void QZeta::correct()
return;
}
- RASmodel::correct();
+ RASModel::correct();
volScalarField S2 = 2*magSqr(symm(fvc::grad(U_)));
@@ -323,7 +323,7 @@ void QZeta::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
index 00bac9903e84866fc861ab43d2f9e45e18dde064..a2edb4bb6c366d68d3bf2fa12ae5b7a6ef5426dc 100644
--- a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
+++ b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
@@ -37,7 +37,7 @@ SourceFiles
#ifndef QZeta_H
#define QZeta_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 QZeta
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -168,7 +168,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C b/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.C
similarity index 86%
rename from src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C
rename to src/turbulenceModels/RAS/incompressible/RASModel/RASModel.C
index 27f54cccc8294a70aac3da7baa6ef3c0ad523a89..36567e7b8c5778d66646f4644b637ff5cabc16c4 100644
--- a/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C
+++ b/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.C
@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "RASmodel.H"
+#include "RASModel.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -36,23 +36,23 @@ namespace incompressible
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-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 volVectorField& U,
@@ -64,7 +64,7 @@ RASmodel::RASmodel
(
IOobject
(
- "turbulenceProperties",
+ "RASProperties",
U.time().constant(),
U.db(),
IOobject::MUST_READ,
@@ -81,7 +81,7 @@ RASmodel::RASmodel
turbulence_(lookup("turbulence")),
printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
- RASmodelCoeffs_(subDict(type + "Coeffs")),
+ coeffDict_(subDict(type + "Coeffs")),
kappa_
(
@@ -102,13 +102,13 @@ RASmodel::RASmodel
{}
-RASmodel::~RASmodel()
+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]
*sqrt(k()().boundaryField()[patchNo].patchInternalField())
@@ -140,7 +140,7 @@ tmp<scalarField> RASmodel::yPlus(const label patchNo) const
{
WarningIn
(
- "tmp<scalarField> RASmodel::yPlus(const label patchNo)"
+ "tmp<scalarField> RASModel::yPlus(const label patchNo)"
) << "const : " << endl
<< "Patch " << patchNo << " is not a wall. Returning blank field"
<< endl;
@@ -152,7 +152,7 @@ tmp<scalarField> RASmodel::yPlus(const label patchNo) const
}
-void RASmodel::correct()
+void RASModel::correct()
{
if (mesh_.changing())
{
@@ -161,12 +161,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_);
diff --git a/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.H b/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
similarity index 92%
rename from src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.H
rename to src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
index d6e0bd61733c9cf53d44201cabf98d385d2b43ab..9944d6ffe0363e83a0b4b57039de5632c1fe0465 100644
--- a/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.H
+++ b/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
@@ -29,19 +29,19 @@ Description
Namespace for incompressible RAS turbulence models.
Class
- Foam::incompressible::RASmodel
+ Foam::incompressible::RASModel
Description
Abstract base class for incompressible turbulence models.
SourceFiles
- RASmodel.C
+ RASModel.C
newTurbulenceModel.C
\*---------------------------------------------------------------------------*/
-#ifndef RASmodel_H
-#define RASmodel_H
+#ifndef RASModel_H
+#define RASModel_H
#include "volFields.H"
#include "surfaceFields.H"
@@ -64,10 +64,10 @@ namespace incompressible
{
/*---------------------------------------------------------------------------*\
- Class RASmodel Declaration
+ Class RASModel Declaration
\*---------------------------------------------------------------------------*/
-class RASmodel
+class RASModel
:
public IOdictionary
{
@@ -86,7 +86,7 @@ protected:
Switch turbulence_;
Switch printCoeffs_;
- dictionary RASmodelCoeffs_;
+ dictionary coeffDict_;
scalar kappa_;
scalar E_;
@@ -112,16 +112,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
@@ -129,7 +129,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
- RASmodel,
+ RASModel,
dictionary,
(
const volVectorField& U,
@@ -143,7 +143,7 @@ public:
// Constructors
//- Construct from components
- RASmodel
+ RASModel
(
const word& type,
const volVectorField& U,
@@ -155,7 +155,7 @@ public:
// Selectors
//- Return a reference to the selected turbulence model
- static autoPtr<RASmodel> New
+ static autoPtr<RASModel> New
(
const volVectorField& U,
const surfaceScalarField& phi,
@@ -165,7 +165,7 @@ public:
// Destructor
- virtual ~RASmodel();
+ virtual ~RASModel();
// Member Functions
@@ -231,6 +231,12 @@ public:
return yPlusLam_;
}
+ //- Const access to the coefficients dictionary
+ const dictionary& coeffDict()
+ {
+ return coeffDict_;
+ }
+
//- Return the laminar viscosity
const volScalarField& nu() const
diff --git a/src/turbulenceModels/RAS/incompressible/RASmodel/checkIncompressibleTurbulenceModelsLock.C b/src/turbulenceModels/RAS/incompressible/RASModel/checkIncompressibleTurbulenceModelsLock.C
similarity index 100%
rename from src/turbulenceModels/RAS/incompressible/RASmodel/checkIncompressibleTurbulenceModelsLock.C
rename to src/turbulenceModels/RAS/incompressible/RASModel/checkIncompressibleTurbulenceModelsLock.C
diff --git a/src/turbulenceModels/RAS/incompressible/RASmodel/newRASmodel.C b/src/turbulenceModels/RAS/incompressible/RASModel/newRASModel.C
similarity index 79%
rename from src/turbulenceModels/RAS/incompressible/RASmodel/newRASmodel.C
rename to src/turbulenceModels/RAS/incompressible/RASModel/newRASModel.C
index 5eb569274c1a44dff7f799b532862f3b82ce441b..3e138f01808cf7fe3aef27f1bc64dd6f6e7cdcbf 100644
--- a/src/turbulenceModels/RAS/incompressible/RASmodel/newRASmodel.C
+++ b/src/turbulenceModels/RAS/incompressible/RASModel/newRASModel.C
@@ -26,7 +26,7 @@ License
#include "error.H"
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -37,24 +37,24 @@ namespace incompressible
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-autoPtr<RASmodel> RASmodel::New
+autoPtr<RASModel> RASModel::New
(
const volVectorField& U,
const surfaceScalarField& phi,
transportModel& transport
)
{
- 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,
@@ -62,29 +62,29 @@ 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 volVectorField&, "
+ "RASModel::New(const volVectorField&, "
"const surfaceScalarField&, transportModel&)"
- ) << "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>(cstrIter()(U, phi, transport));
+ return autoPtr<RASModel>(cstrIter()(U, phi, transport));
}
diff --git a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C
index 159c691105e08c7812dd3f3ab214d90f25d7c5eb..449bb2c47c6810e994091b3be84dd8739016ab99 100644
--- a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C
@@ -34,13 +34,13 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(RNGkEpsilon, 0);
-addToRunTimeSelectionTable(RASmodel, RNGkEpsilon, dictionary);
+addToRunTimeSelectionTable(RASModel, RNGkEpsilon, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -51,14 +51,14 @@ RNGkEpsilon::RNGkEpsilon
transportModel& lamTransportModel
)
:
- RASmodel(typeName, U, phi, lamTransportModel),
+ RASModel(typeName, U, phi, lamTransportModel),
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
(
"Cmu",
- RASmodelCoeffs_,
+ coeffDict_,
0.0845
)
),
@@ -67,7 +67,7 @@ RNGkEpsilon::RNGkEpsilon
dimensioned<scalar>::lookupOrAddToDict
(
"C1",
- RASmodelCoeffs_,
+ coeffDict_,
1.42
)
),
@@ -76,7 +76,7 @@ RNGkEpsilon::RNGkEpsilon
dimensioned<scalar>::lookupOrAddToDict
(
"C2",
- RASmodelCoeffs_,
+ coeffDict_,
1.68
)
),
@@ -85,7 +85,7 @@ RNGkEpsilon::RNGkEpsilon
dimensioned<scalar>::lookupOrAddToDict
(
"alphak",
- RASmodelCoeffs_,
+ coeffDict_,
1.39
)
),
@@ -94,7 +94,7 @@ RNGkEpsilon::RNGkEpsilon
dimensioned<scalar>::lookupOrAddToDict
(
"alphaEps",
- RASmodelCoeffs_,
+ coeffDict_,
1.39
)
),
@@ -103,7 +103,7 @@ RNGkEpsilon::RNGkEpsilon
dimensioned<scalar>::lookupOrAddToDict
(
"eta0",
- RASmodelCoeffs_,
+ coeffDict_,
4.38
)
),
@@ -112,7 +112,7 @@ RNGkEpsilon::RNGkEpsilon
dimensioned<scalar>::lookupOrAddToDict
(
"beta",
- RASmodelCoeffs_,
+ coeffDict_,
0.012
)
),
@@ -207,15 +207,15 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevReff(volVectorField& U) const
bool RNGkEpsilon::read()
{
- if (RASmodel::read())
+ if (RASModel::read())
{
- Cmu_.readIfPresent(RASmodelCoeffs_);
- C1_.readIfPresent(RASmodelCoeffs_);
- C2_.readIfPresent(RASmodelCoeffs_);
- alphak_.readIfPresent(RASmodelCoeffs_);
- alphaEps_.readIfPresent(RASmodelCoeffs_);
- eta0_.readIfPresent(RASmodelCoeffs_);
- beta_.readIfPresent(RASmodelCoeffs_);
+ Cmu_.readIfPresent(coeffDict_);
+ C1_.readIfPresent(coeffDict_);
+ C2_.readIfPresent(coeffDict_);
+ alphak_.readIfPresent(coeffDict_);
+ alphaEps_.readIfPresent(coeffDict_);
+ eta0_.readIfPresent(coeffDict_);
+ beta_.readIfPresent(coeffDict_);
return true;
}
@@ -235,7 +235,7 @@ void RNGkEpsilon::correct()
return;
}
- RASmodel::correct();
+ RASModel::correct();
volScalarField S2 = 2*magSqr(symm(fvc::grad(U_)));
@@ -293,7 +293,7 @@ void RNGkEpsilon::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
index 8cc16b0ffa1f1a0357a7908ad9a4fd6665b5a3ee..01b50d03eefa88ce6497f021a11f256c45687890 100644
--- a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
@@ -52,7 +52,7 @@ SourceFiles
#ifndef RNGkEpsilon_H
#define RNGkEpsilon_H
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +60,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace RAS
class RNGkEpsilon
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -165,7 +165,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C
index 45b21fd75ad105d09f4965f546ab247a56804ccd..317e99f6c8463a2ab5d79e05a7eaa5ba22e84238 100644
--- a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C
@@ -34,13 +34,13 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(SpalartAllmaras, 0);
-addToRunTimeSelectionTable(RASmodel, SpalartAllmaras, dictionary);
+addToRunTimeSelectionTable(RASModel, SpalartAllmaras, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@@ -112,14 +112,14 @@ SpalartAllmaras::SpalartAllmaras
transportModel& lamTransportModel
)
:
- RASmodel(typeName, U, phi, lamTransportModel),
+ RASModel(typeName, U, phi, lamTransportModel),
alphaNut_
(
dimensioned<scalar>::lookupOrAddToDict
(
"alphaNut",
- RASmodelCoeffs_,
+ coeffDict_,
1.5
)
),
@@ -129,7 +129,7 @@ SpalartAllmaras::SpalartAllmaras
dimensioned<scalar>::lookupOrAddToDict
(
"Cb1",
- RASmodelCoeffs_,
+ coeffDict_,
0.1355
)
),
@@ -138,7 +138,7 @@ SpalartAllmaras::SpalartAllmaras
dimensioned<scalar>::lookupOrAddToDict
(
"Cb2",
- RASmodelCoeffs_,
+ coeffDict_,
0.622
)
),
@@ -148,7 +148,7 @@ SpalartAllmaras::SpalartAllmaras
dimensioned<scalar>::lookupOrAddToDict
(
"Cw2",
- RASmodelCoeffs_,
+ coeffDict_,
0.3
)
),
@@ -157,7 +157,7 @@ SpalartAllmaras::SpalartAllmaras
dimensioned<scalar>::lookupOrAddToDict
(
"Cw3",
- RASmodelCoeffs_,
+ coeffDict_,
2.0
)
),
@@ -166,7 +166,7 @@ SpalartAllmaras::SpalartAllmaras
dimensioned<scalar>::lookupOrAddToDict
(
"Cv1",
- RASmodelCoeffs_,
+ coeffDict_,
7.1
)
),
@@ -175,7 +175,7 @@ SpalartAllmaras::SpalartAllmaras
dimensioned<scalar>::lookupOrAddToDict
(
"Cv2",
- RASmodelCoeffs_,
+ coeffDict_,
5.0
)
),
@@ -315,17 +315,17 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevReff(volVectorField& U) const
bool SpalartAllmaras::read()
{
- if (RASmodel::read())
+ if (RASModel::read())
{
- alphaNut_.readIfPresent(RASmodelCoeffs_);
+ alphaNut_.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;
}
@@ -345,7 +345,7 @@ void SpalartAllmaras::correct()
return;
}
- RASmodel::correct();
+ RASModel::correct();
if (mesh_.changing())
{
@@ -383,7 +383,7 @@ void SpalartAllmaras::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
index d0fbfa7153c686fc68ddcbb696aa38c13e0ce344..947eda2c884c59c0f45dd766514d522b66bde4f3 100644
--- a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
@@ -67,7 +67,7 @@ SourceFiles
#ifndef SpalartAllmaras_H
#define SpalartAllmaras_H
-#include "RASmodel.H"
+#include "RASModel.H"
#include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -76,7 +76,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -85,7 +85,7 @@ namespace RAS
class SpalartAllmaras
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -181,7 +181,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C
index 1fd0661b1dd736dade1e80fed715a0881aba969f..c9259dc581fc73c56c1961540abdd15e8a6d4ed5 100644
--- a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C
@@ -34,13 +34,13 @@ namespace Foam
{
namespace incompressible
{
-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
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 @@ 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
(
"alphaEps",
- RASmodelCoeffs_,
+ coeffDict_,
0.76923
)
),
@@ -180,12 +180,12 @@ tmp<fvVectorMatrix> kEpsilon::divDevReff(volVectorField& U) const
bool kEpsilon::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;
}
@@ -205,7 +205,7 @@ void kEpsilon::correct()
return;
}
- RASmodel::correct();
+ RASModel::correct();
volScalarField G = nut_*2*magSqr(symm(fvc::grad(U_)));
@@ -258,7 +258,7 @@ void kEpsilon::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
index 79a83f55071edd87f40e34f7f39b12dc53dd3529..b0e93d3a47283163386b0f8c0444476e3c1eb16f 100644
--- a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
@@ -50,7 +50,7 @@ SourceFiles
#ifndef kEpsilon_H
#define kEpsilon_H
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,7 +58,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -67,7 +67,7 @@ namespace RAS
class kEpsilon
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -165,7 +165,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C
index e675891d16940d79ddf4d2b1f1614dc614d6e678..f70125a886e48e0a85d78a625fcdc814ca14ed29 100644
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C
@@ -34,13 +34,13 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(kOmegaSST, 0);
-addToRunTimeSelectionTable(RASmodel, kOmegaSST, dictionary);
+addToRunTimeSelectionTable(RASModel, kOmegaSST, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@@ -94,14 +94,14 @@ kOmegaSST::kOmegaSST
transportModel& lamTransportModel
)
:
- RASmodel(typeName, U, phi, lamTransportModel),
+ RASModel(typeName, U, phi, lamTransportModel),
alphaK1_
(
dimensioned<scalar>::lookupOrAddToDict
(
"alphaK1",
- RASmodelCoeffs_,
+ coeffDict_,
0.85034
)
),
@@ -110,7 +110,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"alphaK2",
- RASmodelCoeffs_,
+ coeffDict_,
1.0
)
),
@@ -119,7 +119,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"alphaOmega1",
- RASmodelCoeffs_,
+ coeffDict_,
0.5
)
),
@@ -128,7 +128,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"alphaOmega2",
- RASmodelCoeffs_,
+ coeffDict_,
0.85616
)
),
@@ -137,7 +137,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"gamma1",
- RASmodelCoeffs_,
+ coeffDict_,
0.5532
)
),
@@ -146,7 +146,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"gamma2",
- RASmodelCoeffs_,
+ coeffDict_,
0.4403
)
),
@@ -155,7 +155,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"beta1",
- RASmodelCoeffs_,
+ coeffDict_,
0.075
)
),
@@ -164,7 +164,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"beta2",
- RASmodelCoeffs_,
+ coeffDict_,
0.0828
)
),
@@ -173,7 +173,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"betaStar",
- RASmodelCoeffs_,
+ coeffDict_,
0.09
)
),
@@ -182,7 +182,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"a1",
- RASmodelCoeffs_,
+ coeffDict_,
0.31
)
),
@@ -191,7 +191,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"c1",
- RASmodelCoeffs_,
+ coeffDict_,
10.0
)
),
@@ -204,7 +204,7 @@ kOmegaSST::kOmegaSST
dimensioned<scalar>::lookupOrAddToDict
(
"Cmu",
- RASmodelCoeffs_,
+ coeffDict_,
0.09
)
),
@@ -300,20 +300,20 @@ tmp<fvVectorMatrix> kOmegaSST::divDevReff(volVectorField& U) const
bool kOmegaSST::read()
{
- if (RASmodel::read())
+ if (RASModel::read())
{
- alphaK1_.readIfPresent(RASmodelCoeffs_);
- alphaK2_.readIfPresent(RASmodelCoeffs_);
- alphaOmega1_.readIfPresent(RASmodelCoeffs_);
- alphaOmega2_.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_);
+ 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;
}
@@ -333,7 +333,7 @@ void kOmegaSST::correct()
return;
}
- RASmodel::correct();
+ RASModel::correct();
if (mesh_.changing())
{
@@ -401,7 +401,7 @@ void kOmegaSST::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
index f6890d3ce6fa7ad86554ec5e41bc0f56e1d9ef84..da3c2dc06494295efe762b9cfc7105429e332353 100644
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
@@ -84,7 +84,7 @@ SourceFiles
#ifndef kOmegaSST_H
#define kOmegaSST_H
-#include "RASmodel.H"
+#include "RASModel.H"
#include "wallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -93,7 +93,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -102,7 +102,7 @@ namespace RAS
class kOmegaSST
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -281,7 +281,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/laminar/laminar.C b/src/turbulenceModels/RAS/incompressible/laminar/laminar.C
index f97260a35ab0afebfa8f70d54c462718634b5644..0a80ee75566e10144304da84a53b3715a9d1a1ce 100644
--- a/src/turbulenceModels/RAS/incompressible/laminar/laminar.C
+++ b/src/turbulenceModels/RAS/incompressible/laminar/laminar.C
@@ -33,13 +33,13 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(laminar, 0);
-addToRunTimeSelectionTable(RASmodel, laminar, dictionary);
+addToRunTimeSelectionTable(RASModel, laminar, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -50,7 +50,7 @@ laminar::laminar
transportModel& lamTransportModel
)
:
- RASmodel(typeName, U, phi, lamTransportModel)
+ RASModel(typeName, U, phi, lamTransportModel)
{}
@@ -184,7 +184,7 @@ tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
bool laminar::read()
{
- return RASmodel::read();
+ return RASModel::read();
}
@@ -196,7 +196,7 @@ void laminar::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/laminar/laminar.H b/src/turbulenceModels/RAS/incompressible/laminar/laminar.H
index 5546e7d330a25c10bea56ea3103b40aa05d19a81..4052c08e93204a7e1feaa1e4293cddd846605ae7 100644
--- a/src/turbulenceModels/RAS/incompressible/laminar/laminar.H
+++ b/src/turbulenceModels/RAS/incompressible/laminar/laminar.H
@@ -36,7 +36,7 @@ SourceFiles
#ifndef laminar_H
#define laminar_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 laminar
:
- public RASmodel
+ public RASModel
{
public:
@@ -112,7 +112,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C
index 85ce8cd3a27b3a702f36ebfc6a8daa35537824e7..2dc75a8f027c01bb66bd46f924ba3280c0d3fa7c 100644
--- a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C
@@ -34,13 +34,13 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(realizableKE, 0);
-addToRunTimeSelectionTable(RASmodel, realizableKE, dictionary);
+addToRunTimeSelectionTable(RASModel, realizableKE, dictionary);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@@ -92,14 +92,14 @@ realizableKE::realizableKE
transportModel& lamTransportModel
)
:
- RASmodel(typeName, U, phi, lamTransportModel),
+ RASModel(typeName, U, phi, lamTransportModel),
Cmu_
(
dimensioned<scalar>::lookupOrAddToDict
(
"Cmu",
- RASmodelCoeffs_,
+ coeffDict_,
0.09
)
),
@@ -108,7 +108,7 @@ realizableKE::realizableKE
dimensioned<scalar>::lookupOrAddToDict
(
"A0",
- RASmodelCoeffs_,
+ coeffDict_,
4.0
)
),
@@ -117,7 +117,7 @@ realizableKE::realizableKE
dimensioned<scalar>::lookupOrAddToDict
(
"C2",
- RASmodelCoeffs_,
+ coeffDict_,
1.9
)
),
@@ -126,7 +126,7 @@ realizableKE::realizableKE
dimensioned<scalar>::lookupOrAddToDict
(
"alphak",
- RASmodelCoeffs_,
+ coeffDict_,
1.0
)
),
@@ -135,7 +135,7 @@ realizableKE::realizableKE
dimensioned<scalar>::lookupOrAddToDict
(
"alphaEps",
- RASmodelCoeffs_,
+ coeffDict_,
0.833333
)
),
@@ -231,13 +231,13 @@ tmp<fvVectorMatrix> realizableKE::divDevReff(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_);
+ Cmu_.readIfPresent(coeffDict_);
+ A0_.readIfPresent(coeffDict_);
+ C2_.readIfPresent(coeffDict_);
+ alphak_.readIfPresent(coeffDict_);
+ alphaEps_.readIfPresent(coeffDict_);
return true;
}
@@ -257,7 +257,7 @@ void realizableKE::correct()
return;
}
- RASmodel::correct();
+ RASModel::correct();
volTensorField gradU = fvc::grad(U_);
volScalarField S2 = 2*magSqr(dev(symm(gradU)));
@@ -321,7 +321,7 @@ void realizableKE::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
index 5f488606cc732e14e9a0c1d571e42633e11eaea1..7a38d7e62d51862c763355b2502c86dd1da37fe4 100644
--- a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
@@ -60,7 +60,7 @@ SourceFiles
#ifndef realizableKE_H
#define realizableKE_H
-#include "RASmodel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,7 +68,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -77,7 +77,7 @@ namespace RAS
class realizableKE
:
- public RASmodel
+ public RASModel
{
// Private data
@@ -182,7 +182,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
index 0e23cdb23c4549ad022ea7badf200f945fa48498..2f242c1a4feccc66b2f6308ab3828726c5300efb 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
@@ -25,7 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "nutStandardRoughWallFunctionFvPatchScalarField.H"
-#include "RASmodel.H"
+#include "RASModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "addToRunTimeSelectionTable.H"
@@ -36,7 +36,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -120,8 +120,8 @@ void nutStandardRoughWallFunctionFvPatchScalarField::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();
@@ -293,7 +293,7 @@ makePatchTypeField
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
index 6d7c53e09e38e300b0882fc1844ed31baa645c81..0aee29a0c50cf69df81e860db8b6cfe0032c11fa 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
@@ -44,7 +44,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -189,7 +189,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
index 71bb6f4cd68306781422e224de46fb82ca98b894..3eee19f990f8a3a24f9902158d99882d97fe1d0b 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
@@ -25,7 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "nutStandardWallFunctionFvPatchScalarField.H"
-#include "RASmodel.H"
+#include "RASModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "addToRunTimeSelectionTable.H"
@@ -36,7 +36,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -105,8 +105,8 @@ void nutStandardWallFunctionFvPatchScalarField::evaluate
const Pstream::commsTypes
)
{
- const RASmodel& rasModel
- = db().lookupObject<RASmodel>("turbulenceProperties");
+ const RASModel& rasModel
+ = db().lookupObject<RASModel>("RASProperties");
scalar kappa = rasModel.kappa();
scalar E = rasModel.E();
@@ -162,7 +162,7 @@ makePatchTypeField(fvPatchScalarField, nutStandardWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
index 6f679df14659199f337d2f6f35f35997f9fd9ece..7b0bc7398ba8e9791c438d371a5ccd91461b9683 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
@@ -44,7 +44,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -140,7 +140,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
index 2029cd5d714e909395c29e355a8d6d03d440e868..12dc46e96d0e8827dbfd0c67a4e3abc3029cfb40 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
@@ -25,7 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "nutWallFunctionFvPatchScalarField.H"
-#include "RASmodel.H"
+#include "RASModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "addToRunTimeSelectionTable.H"
@@ -36,7 +36,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -97,8 +97,8 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
void nutWallFunctionFvPatchScalarField::evaluate(const Pstream::commsTypes)
{
- const RASmodel& rasModel
- = db().lookupObject<RASmodel>("turbulenceProperties");
+ const RASModel& rasModel
+ = db().lookupObject<RASModel>("RASProperties");
scalar kappa = rasModel.kappa();
scalar E = rasModel.E();
@@ -166,7 +166,7 @@ makePatchTypeField(fvPatchScalarField, nutWallFunctionFvPatchScalarField);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
index ee22de35eb24eb2ee6bebc701da6ab21eda08683..ed97365c53efd24ac9ca1f6265036bd23662a3a2 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
@@ -44,7 +44,7 @@ namespace Foam
{
namespace incompressible
{
-namespace RAS
+namespace RASModels
{
/*---------------------------------------------------------------------------*\
@@ -140,7 +140,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace RAS
+} // End namespace RASModels
} // End namespace incompressible
} // End namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H
index 712673ce7df9ff96554e5e203640c2d192df6fa4..52c4b0c0e14491ecadd0d779a0aaf6a0e602dc6d 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H
@@ -76,7 +76,7 @@ Description
label faceCelli = curPatch.faceCells()[facei];
scalar yPlus =
- Cmu25*RASmodel::y_[patchi][facei]
+ Cmu25*RASModel::y_[patchi][facei]
*sqrt(k_[faceCelli])
/nuw[facei];
@@ -88,7 +88,7 @@ Description
epsilon_[faceCelli] +=
Cmu75*pow(k_[faceCelli], 1.5)
- /(kappa_*RASmodel::y_[patchi][facei]);
+ /(kappa_*RASModel::y_[patchi][facei]);
if (yPlus > yPlusLam_)
{
@@ -96,7 +96,7 @@ Description
(nutw[facei] + nuw[facei])
*magFaceGradU[facei]
*Cmu25*sqrt(k_[faceCelli])
- /(kappa_*RASmodel::y_[patchi][facei]);
+ /(kappa_*RASModel::y_[patchi][facei]);
}
}
}
diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
index af20a46ea993f94758109739921470e03ab8172a..011c983e563e87978d66ab66bbd483b5b145f123 100644
--- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
+++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
#include "MRFZones.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H b/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H
index fc1c30b19ff2764f52e44c8ceb79cec95b349f24..43242a6e377c03d6c71f0ee37612f82a3fa42435 100644
--- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H
+++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H
@@ -36,9 +36,9 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::RASmodel> turbulence
+ autoPtr<incompressible::RASModel> turbulence
(
- incompressible::RASmodel::New(U, phi, laminarTransport)
+ incompressible::RASModel::New(U, phi, laminarTransport)
);
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/RASProperties
similarity index 98%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties
rename to tutorials/MRFSimpleFoam/mixerVessel2D/constant/RASProperties
index 0caf7f3952c5a240c8ea03e54bbd500983677dce..4103ac780d7799151cd8dc72c895dffecbf56529 100644
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/XiFoam/moriyoshiHomogeneous/constant/RASProperties
similarity index 96%
rename from tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties
rename to tutorials/XiFoam/moriyoshiHomogeneous/constant/RASProperties
index 0e59c3d7f65e08042182e8da6b5aa317472c65c0..f13934ef5298af87a6d9c9f5011ea71ac071e499 100644
--- a/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties
+++ b/tutorials/XiFoam/moriyoshiHomogeneous/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel LaunderSharmaKE;
+RASModel LaunderSharmaKE;
turbulence on;
diff --git a/tutorials/Xoodles/pitzDaily/constant/turbulenceProperties b/tutorials/Xoodles/pitzDaily/constant/LESProperties
similarity index 97%
rename from tutorials/Xoodles/pitzDaily/constant/turbulenceProperties
rename to tutorials/Xoodles/pitzDaily/constant/LESProperties
index d7016db5007b33b03400b91210a9f6e4d05cae8b..e8429589e635137303f7b67a7b3f9d6d3db36127 100644
--- a/tutorials/Xoodles/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/Xoodles/pitzDaily/constant/LESProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESmodel oneEqEddy;
+LESModel oneEqEddy;
delta cubeRootVol;
diff --git a/tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties b/tutorials/Xoodles/pitzDaily3D/constant/LESProperties
similarity index 97%
rename from tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties
rename to tutorials/Xoodles/pitzDaily3D/constant/LESProperties
index f3f94216e30623c2681507643f63e6311eca3d66..b3b61a15b3bd2ccd70fea8b8183d6f3a98e26013 100644
--- a/tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties
+++ b/tutorials/Xoodles/pitzDaily3D/constant/LESProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESmodel oneEqEddy;
+LESModel oneEqEddy;
delta cubeRootVol;
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties b/tutorials/boundaryFoam/boundaryLaunderSharma/constant/RASProperties
similarity index 98%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties
rename to tutorials/boundaryFoam/boundaryLaunderSharma/constant/RASProperties
index d859aae7f435e99f956390fd3b33f4630c666160..380a7d6fc08f394101e79695b488256e1eb6ae26 100644
--- a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties
+++ b/tutorials/boundaryFoam/boundaryLaunderSharma/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel LaunderSharmaKE;
+RASModel LaunderSharmaKE;
turbulence on;
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties b/tutorials/boundaryFoam/boundaryWallFunctions/constant/RASProperties
similarity index 98%
rename from tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
rename to tutorials/boundaryFoam/boundaryWallFunctions/constant/RASProperties
index 2c541c2155bc7e2f5c2b796f38dc828bde3018cf..52a82b34fb2731636e764dd0b4b70935e505bff6 100644
--- a/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
+++ b/tutorials/boundaryFoam/boundaryWallFunctions/constant/RASProperties
@@ -18,13 +18,13 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Turbulence model selection
-RASmodel kEpsilon;
+RASModel kEpsilon;
// Do you wish to calculate turbulence?
turbulence on;
diff --git a/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/bubbleFoam/bubbleColumn/constant/RASProperties
similarity index 94%
rename from tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties
rename to tutorials/bubbleFoam/bubbleColumn/constant/RASProperties
index 681d37f289f027b34c5017e58b3d05d24d5ef046..301e332c9c771dfa6e9183ff984aae1993fa3812 100644
--- a/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties
+++ b/tutorials/bubbleFoam/bubbleColumn/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel laminar;
+RASModel laminar;
turbulence off;
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantFoam/hotRoom/constant/RASProperties
similarity index 97%
rename from tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties
rename to tutorials/buoyantFoam/hotRoom/constant/RASProperties
index 28f4f604118688d64ee289dba15ae98604d34c58..429d151fa1c802d0f87ab9ccdc1db38e424b141d 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties
+++ b/tutorials/buoyantFoam/hotRoom/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties b/tutorials/buoyantSimpleFoam/hotRoom/constant/RASProperties
similarity index 97%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties
rename to tutorials/buoyantSimpleFoam/hotRoom/constant/RASProperties
index 28f4f604118688d64ee289dba15ae98604d34c58..429d151fa1c802d0f87ab9ccdc1db38e424b141d 100644
--- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties
+++ b/tutorials/buoyantSimpleFoam/hotRoom/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties
similarity index 97%
rename from tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties
rename to tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties
index 28f4f604118688d64ee289dba15ae98604d34c58..429d151fa1c802d0f87ab9ccdc1db38e424b141d 100644
--- a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties
+++ b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/channelOodles/channel395/constant/turbulenceProperties b/tutorials/channelOodles/channel395/constant/LESProperties
similarity index 97%
rename from tutorials/channelOodles/channel395/constant/turbulenceProperties
rename to tutorials/channelOodles/channel395/constant/LESProperties
index e4c8498ce7e61ea7de5f09cf5b5b28462b1fe090..12f306265daaad235ba88281937b11c58635cbed 100644
--- a/tutorials/channelOodles/channel395/constant/turbulenceProperties
+++ b/tutorials/channelOodles/channel395/constant/LESProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESmodel oneEqEddy;
+LESModel oneEqEddy;
printCoeffs on;
diff --git a/tutorials/coodles/pitzDaily/constant/turbulenceProperties b/tutorials/coodles/pitzDaily/constant/LESProperties
similarity index 97%
rename from tutorials/coodles/pitzDaily/constant/turbulenceProperties
rename to tutorials/coodles/pitzDaily/constant/LESProperties
index 38f84693625e0050b401f9c0ec3ba8fe025f34f2..ccba2bdd385ea6d1d4481fe616065e1979f502c6 100644
--- a/tutorials/coodles/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/coodles/pitzDaily/constant/LESProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESmodel oneEqEddy;
+LESModel oneEqEddy;
printCoeffs on;
diff --git a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/dieselFoam/aachenBomb/constant/RASProperties
similarity index 97%
rename from tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
rename to tutorials/dieselFoam/aachenBomb/constant/RASProperties
index ec87c01487efa0132333ddfc68e16719125c8ff0..392d2a71963afc969d7756e030783d767be01d1f 100644
--- a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
+++ b/tutorials/dieselFoam/aachenBomb/constant/RASProperties
@@ -10,13 +10,13 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
location "constant";
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/dnsFoam/boxTurb16/constant/turbulenceProperties b/tutorials/dnsFoam/boxTurb16/constant/turbulenceProperties
index 76c4609b7c9adf6e955a3a95497f7b695903ce2c..07280f3fbc19ab2b13ee19b96df1c70751a3e746 100644
--- a/tutorials/dnsFoam/boxTurb16/constant/turbulenceProperties
+++ b/tutorials/dnsFoam/boxTurb16/constant/turbulenceProperties
@@ -17,7 +17,7 @@ FoamFile
local "";
class dictionary;
- object transportProperties;
+ object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties b/tutorials/engineFoam/kivaTest/constant/turbulenceProperties
index 1dd18e0cb50c79130ccc359a5b775f30393fdac4..66ebdb5c81196555f844081b72c9ac3fb9ef0e87 100644
--- a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties
+++ b/tutorials/engineFoam/kivaTest/constant/turbulenceProperties
@@ -17,7 +17,7 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/interDyMFoam/damBreakWithObstacle/constant/RASProperties
similarity index 97%
rename from tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties
rename to tutorials/interDyMFoam/damBreakWithObstacle/constant/RASProperties
index 06673cebae41aa86068d198085b2c0120679b736..334fbbb480fe9b35f9295e042cee4da342d0df93 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties
+++ b/tutorials/interDyMFoam/damBreakWithObstacle/constant/RASProperties
@@ -17,13 +17,13 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// RASmodel kEpsilon;
-RASmodel laminar;
+// RASModel kEpsilon;
+RASModel laminar;
turbulence on;
diff --git a/tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties b/tutorials/lesInterFoam/nozzleFlow2D/constant/LESProperties
similarity index 97%
rename from tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties
rename to tutorials/lesInterFoam/nozzleFlow2D/constant/LESProperties
index b1a94d71a7427d4ddec8ee2950d3ad56b09ffb02..3072beddba8a568302b95fc0ce73dc3cd8cdc1e1 100644
--- a/tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties
+++ b/tutorials/lesInterFoam/nozzleFlow2D/constant/LESProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESmodel oneEqEddy;
+LESModel oneEqEddy;
delta smooth;
diff --git a/tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties b/tutorials/oodles/pitzDaily/constant/LESProperties
similarity index 97%
rename from tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties
rename to tutorials/oodles/pitzDaily/constant/LESProperties
index a58f6765362b51d35cdccbbfbec186de7e65ba43..462be1303604e853bee9d26fa4aa0ecb16d7232b 100644
--- a/tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties
+++ b/tutorials/oodles/pitzDaily/constant/LESProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESmodel oneEqEddy;
+LESModel oneEqEddy;
delta cubeRootVol;
diff --git a/tutorials/oodles/pitzDaily/constant/turbulenceProperties b/tutorials/oodles/pitzDailyDirectMapped/constant/LESProperties
similarity index 97%
rename from tutorials/oodles/pitzDaily/constant/turbulenceProperties
rename to tutorials/oodles/pitzDailyDirectMapped/constant/LESProperties
index a58f6765362b51d35cdccbbfbec186de7e65ba43..462be1303604e853bee9d26fa4aa0ecb16d7232b 100644
--- a/tutorials/oodles/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/oodles/pitzDailyDirectMapped/constant/LESProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESmodel oneEqEddy;
+LESModel oneEqEddy;
delta cubeRootVol;
diff --git a/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties b/tutorials/rasInterFoam/damBreak/constant/RASProperties
similarity index 98%
rename from tutorials/rasInterFoam/damBreak/constant/turbulenceProperties
rename to tutorials/rasInterFoam/damBreak/constant/RASProperties
index b12af498024040cafaec90809bdc95e56adc5c76..b250843294ffa5c487417e1ec4d552f4168dd90d 100644
--- a/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties
+++ b/tutorials/rasInterFoam/damBreak/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties b/tutorials/rhoPimpleFoam/angledDuct/constant/RASProperties
similarity index 97%
rename from tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties
rename to tutorials/rhoPimpleFoam/angledDuct/constant/RASProperties
index 636a110eac6fb30a6626fa6a9bc7cc980bda6cae..f0ce09ee4d9182974b42e3989510fe5b0913eaca 100644
--- a/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties
+++ b/tutorials/rhoPimpleFoam/angledDuct/constant/RASProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location constant;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties
similarity index 97%
rename from tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
rename to tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties
index 636a110eac6fb30a6626fa6a9bc7cc980bda6cae..f0ce09ee4d9182974b42e3989510fe5b0913eaca 100644
--- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
+++ b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location constant;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties b/tutorials/rhoTurbFoam/cavity/constant/RASProperties
similarity index 97%
rename from tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties
rename to tutorials/rhoTurbFoam/cavity/constant/RASProperties
index 51fa555354f680458bc127097e27afb113741166..a0589e5b6f0bbf5ce8e53cb84aba3298f88138b6 100644
--- a/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties
+++ b/tutorials/rhoTurbFoam/cavity/constant/RASProperties
@@ -18,13 +18,13 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Turbulence model selection
-RASmodel kOmegaSST; //kEpsilon;
+RASModel kOmegaSST; //kEpsilon;
// Do you wish to calculate turbulence?
turbulence on;
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H
index dba0679738a74e545359384211a57f0fe2a68269..15dadd08d1385ded27b5d72c4c9953b61bf1b536 100644
--- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H
+++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H
@@ -41,9 +41,9 @@
Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::RASmodel> turbulence
+ autoPtr<compressible::RASModel> turbulence
(
- compressible::RASmodel::New
+ compressible::RASModel::New
(
rho,
U,
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C
index 91af3c9dc92089c8277a0ffaca098617cec66444..8bf5c39f22c2cebbd72947371e197aa77fcc6a6c 100644
--- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C
+++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "basicThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
#include "basicThermoCloud.H"
#include "basicKinematicCloud.H"
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/RASProperties
similarity index 97%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties
rename to tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/RASProperties
index b920d56b89fc654fa429b8273ea72656b1fc3af8..6016caca87e4738f689dd735a5cfdd32b1302f5e 100644
--- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties
+++ b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/RASProperties
@@ -18,13 +18,13 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Turbulence model selection
-RASmodel kEpsilon;
+RASModel kEpsilon;
// Do you wish to calculate turbulence?
turbulence on;
diff --git a/tutorials/settlingFoam/dahl/constant/turbulenceProperties b/tutorials/settlingFoam/dahl/constant/RASProperties
similarity index 94%
rename from tutorials/settlingFoam/dahl/constant/turbulenceProperties
rename to tutorials/settlingFoam/dahl/constant/RASProperties
index 18e22ca33931f409e832be020b325e82a83febbf..6c3add3fef54cc10895603d810d9063f6bd146e8 100644
--- a/tutorials/settlingFoam/dahl/constant/turbulenceProperties
+++ b/tutorials/settlingFoam/dahl/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/settlingFoam/tank3D/constant/turbulenceProperties b/tutorials/settlingFoam/tank3D/constant/RASProperties
similarity index 94%
rename from tutorials/settlingFoam/tank3D/constant/turbulenceProperties
rename to tutorials/settlingFoam/tank3D/constant/RASProperties
index 18e22ca33931f409e832be020b325e82a83febbf..6c3add3fef54cc10895603d810d9063f6bd146e8 100644
--- a/tutorials/settlingFoam/tank3D/constant/turbulenceProperties
+++ b/tutorials/settlingFoam/tank3D/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDaily/constant/RASProperties
similarity index 98%
rename from tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties
rename to tutorials/simpleFoam/pitzDaily/constant/RASProperties
index 47a08d2f2a32e1feadded725c3f906e7c6ead113..effbe070e48e5edfeaaf39964f5d1e1a33928ca5 100644
--- a/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/simpleFoam/pitzDaily/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/turbFoam/cavity/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDailyExptInlet/constant/RASProperties
similarity index 98%
rename from tutorials/turbFoam/cavity/constant/turbulenceProperties
rename to tutorials/simpleFoam/pitzDailyExptInlet/constant/RASProperties
index 47a08d2f2a32e1feadded725c3f906e7c6ead113..effbe070e48e5edfeaaf39964f5d1e1a33928ca5 100644
--- a/tutorials/turbFoam/cavity/constant/turbulenceProperties
+++ b/tutorials/simpleFoam/pitzDailyExptInlet/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties b/tutorials/simpleSRFFoam/mixer/constant/RASProperties
similarity index 98%
rename from tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties
rename to tutorials/simpleSRFFoam/mixer/constant/RASProperties
index 16ce7eec7ef68efe94a7877fd22396c7122653f0..a7ad0c0ee6e7d729de6cdac32e8f44a9da47d56f 100644
--- a/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties
+++ b/tutorials/simpleSRFFoam/mixer/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kOmegaSST;
+RASModel kOmegaSST;
turbulence on;
diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H b/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H
index aab42f35345c617abbd155a0d65bb1fecc807462..3e4e11ae301c2acc68e501410d870b8e1bf1b989 100644
--- a/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H
+++ b/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H
@@ -46,9 +46,9 @@
singlePhaseTransportModel laminarTransport(Urel, phi);
- autoPtr<incompressible::RASmodel> turbulence
+ autoPtr<incompressible::RASModel> turbulence
(
- incompressible::RASmodel::New(Urel, phi, laminarTransport)
+ incompressible::RASModel::New(Urel, phi, laminarTransport)
);
Info<< "Creating SRF model\n" << endl;
diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C b/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
index 5e89702f0fe75feb6231611bcfd35f9129fc0191..c3204397ae487a0a3c8fa1c1add447d08d79752d 100644
--- a/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
+++ b/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
#include "SRFModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties b/tutorials/sonicTurbFoam/nacaAirfoil/constant/RASProperties
similarity index 97%
rename from tutorials/sonicTurbFoam/prism/constant/turbulenceProperties
rename to tutorials/sonicTurbFoam/nacaAirfoil/constant/RASProperties
index 232967e8f1ff9c18c196cc83f988fc85de16b400..8a57a45aea43849a02f999ecacf9db77a6fa7756 100644
--- a/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties
+++ b/tutorials/sonicTurbFoam/nacaAirfoil/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel LaunderSharmaKE;
turbulence on;
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties b/tutorials/sonicTurbFoam/prism/constant/RASProperties
similarity index 96%
rename from tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties
rename to tutorials/sonicTurbFoam/prism/constant/RASProperties
index 76cc87613ccabb5f0cc13e85b8cc10821da0e14c..4b881e25f2f20134bb079c8083e5d10303bec8d2 100644
--- a/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties
+++ b/tutorials/sonicTurbFoam/prism/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel LaunderSharmaKE;
+RASModel kEpsilon;
turbulence on;
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties b/tutorials/turbFoam/cavity/constant/RASProperties
similarity index 99%
rename from tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
rename to tutorials/turbFoam/cavity/constant/RASProperties
index 47a08d2f2a32e1feadded725c3f906e7c6ead113..5fb5580547de820f74fe911eea46a0952bd21dc1 100644
--- a/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
+++ b/tutorials/turbFoam/cavity/constant/RASProperties
@@ -17,7 +17,7 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bed/constant/RASProperties
similarity index 97%
rename from tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties
rename to tutorials/twoPhaseEulerFoam/bed/constant/RASProperties
index b2483e1c0d37a3710abe6fd98370660fb3d3bd66..fb0abae365c343484601d3cb7a777ede9ab32569 100644
--- a/tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties
+++ b/tutorials/twoPhaseEulerFoam/bed/constant/RASProperties
@@ -19,7 +19,7 @@ FoamFile
note "turbulenceProperties for Foam";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties
index b2483e1c0d37a3710abe6fd98370660fb3d3bd66..fb0abae365c343484601d3cb7a777ede9ab32569 100644
--- a/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties
+++ b/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties
@@ -19,7 +19,7 @@ FoamFile
note "turbulenceProperties for Foam";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties
similarity index 94%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties
rename to tutorials/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties
index 511b65242bb9a9fb10c2d365ead739646fda203c..9375dd749eb282a580b0b2acad572f1a9e0bb4cb 100644
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties
+++ b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties
@@ -17,12 +17,12 @@ FoamFile
local "";
class dictionary;
- object turbulenceProperties;
+ object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASmodel kEpsilon;
+RASModel kEpsilon;
turbulence off;