diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index a9a4dcff780d278a15b2f361be48e30fa5f35df4..2a1dff685242344f730e3b6ec3ea7b944a6b3516 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 "turbulenceModel.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 a8427f77b1db6dd0f0997700d3f3f4d9a69ee1e1..8734c86b5eacc40563b003d5d146f3b6df6e90bc 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 "turbulenceModel.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 b72598cdc07cac6a3ab2d5f4526e52247e558630..462152ebb5ed75076370b5c887281b2954a0d9af 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::turbulenceModel& 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 6c0097e7e6d83278f81b31fb376ca3b0f0b616d6..d7ebb38267b16dd3dededb5319eda2f23eae0e11 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::turbulenceModel& 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 ab9d69148f11f6992ff365bcab1a8531f3f217cb..802caf3cbfbf2c4b8131fbc2c6ec003359821d09 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::turbulenceModel& 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 2bb411bb979c10084dc1a86b53d41df24efe1e76..9e5d8334f119750c59f23894b1c29f4c32a2f83c 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::turbulenceModel& 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 27cb3b9172188a4e1feb8b66c5a38b104e2b8886..aa37217fceb0ae2d46b96b828d3ad0d58525c6ed 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::turbulenceModel& 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 f5f94c6950180565530a549784092dca3902ad96..b66632cd6117122ce34312bff3ef6b8974f735a7 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 "turbulenceModel.H"
+#include "RASmodel.H"
#include "multivariateSurfaceInterpolationScheme.H"
#include "runTimeSelectionTables.H"
@@ -62,7 +62,7 @@ protected:
dictionary PDRDragModelCoeffs_;
- const compressible::turbulenceModel& 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::turbulenceModel& 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::turbulenceModel& 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::turbulenceModel& 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 5cc0dd4af88b49ad541f0f2c7c732e3e3ba913c0..f099e94a5e180f6fd3d09f9b44198cbd18647646 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::turbulenceModel& 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 76077d0a26979e4a0d27bfda402fe8d282aa24a9..8ea763f8b736c6c1fb4e7a204f722a77ac07b065 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::turbulenceModel& 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 8c4b6cc600f66e4e1cac5a33fe495b2923c74b1d..cf68c7c22807c9e34943c12fdc4cd1fbd22b2587 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::turbulenceModel& 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 357e749e9876d300da7557ce63651012da01284d..244e7858be4bffbd7defeed8cdc91d7aaa7258ea 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -41,7 +41,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(PDRkEpsilon, 0);
-addToRunTimeSelectionTable(turbulenceModel, PDRkEpsilon, dictionary);
+addToRunTimeSelectionTable(RASmodel, PDRkEpsilon, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -53,17 +53,17 @@ PDRkEpsilon::PDRkEpsilon
basicThermo& thermophysicalModel
)
:
- turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
+ RASmodel(typeName, rho, U, phi, thermophysicalModel),
- Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
- C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
- C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
- alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
+ 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
(
- turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
+ RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
),
- alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
+ alphah(RASmodelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
k_
(
@@ -164,14 +164,14 @@ tmp<fvVectorMatrix> PDRkEpsilon::divDevRhoReff(volVectorField& U) const
bool PDRkEpsilon::read()
{
- if (turbulenceModel::read())
+ if (RASmodel::read())
{
- turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
- turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1);
- turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2);
- turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak);
- turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
- turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
+ 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);
return true;
}
@@ -192,7 +192,7 @@ void PDRkEpsilon::correct()
return;
}
- turbulenceModel::correct();
+ RASmodel::correct();
volScalarField divU = fvc::div(phi_/fvc::interpolate(rho_));
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
index 7b207abeb44423a7d98c2284cd1aca8c1508dd83..f093e2f84f622e0ea8943410ae676751d4570da8 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 "turbulenceModel.H"
+#include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,7 +54,7 @@ namespace RAS
class PDRkEpsilon
:
- public turbulenceModel
+ public RASmodel
{
// Private data
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
index 2c0a75b105b98969553a6c31f5005007d7753c58..15737f637946ab47fbbef6ab9fcda47980ad5169 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::turbulenceModel& 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 f5f7d6294597886c1acc2780d9fd1ae7ff3a1c84..5d2b28d7c3969d5f91accef1d12e3295528609b7 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::turbulenceModel& 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 ce985b052812815fd37d08e7f050b5857f32d74e..2b75efb54ebb0b71a7b33285a3522068cdbf3110 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::turbulenceModel& 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 841ea1abb34f2e56d05a25b879d3705c317fc02d..d490dfdb959859f8ffbb9775aeb50e922f245519 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::turbulenceModel& 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 48c98dafc3b23d701ecad00a1ffb174f42f5067a..5536ad8890c4271acee9ae36b28b83cbad0d6ce3 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::turbulenceModel& 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 d4181e26b74875f8cdf11db61241ccf856c59a8e..3e9c04e522c4fb5f9e30d78fabc61588a134f7ba 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::turbulenceModel& 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 4e5169835afb253f4005cd19e19121ad00ad7d7c..9d3d6b05d48d7151ef5881280d2667ce862420b7 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::turbulenceModel& 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 f26c1d61c4bd5de72188bfde3f1086ddd94164de..423b61ca9708452f2a53767f11538e7fc56ef2ed 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 "turbulenceModel.H"
+#include "RASmodel.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +60,7 @@ protected:
dictionary XiEqModelCoeffs_;
const hhuCombustionThermo& thermo_;
- const compressible::turbulenceModel& turbulence_;
+ const compressible::RASmodel& turbulence_;
const volScalarField& Su_;
@@ -91,7 +91,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
- const compressible::turbulenceModel& turbulence,
+ const compressible::RASmodel& turbulence,
const volScalarField& Su
),
(
@@ -110,7 +110,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
- const compressible::turbulenceModel& turbulence,
+ const compressible::RASmodel& turbulence,
const volScalarField& Su
);
@@ -122,7 +122,7 @@ public:
(
const dictionary& XiEqProperties,
const hhuCombustionThermo& thermo,
- const compressible::turbulenceModel& 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 32da055302655f1f18fb7f201824a49d0ca9ffc1..a8885e56ef03f1d7e79d31208fb918af6c1b7374 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::turbulenceModel& 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::turbulenceModel& 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 cbd9fadbc18d55360a8d389804c4bb864cb2e9af..4f42953aa92018f795a67b27adee566c9fd485f4 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::turbulenceModel& 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 1c480f164fe0bbd0dcec9943610fc43ebd46ccb1..249a1910c9e00de8decb6d5778af9a9da8f9f155 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::turbulenceModel& 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 cc8dae2d73562aae653339af548387802e4fd0eb..d71b810bbecfb0a6c75f606ba4d8ae8563ac934b 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::turbulenceModel& 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 aba5e5d6f41c267da4b758129b1e7f57f1b47a3f..6c9a3963e3ff998cf730601cf2433728817ab6c0 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::turbulenceModel& 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 ac028878a059d242bb90c4087303b54e5b114cc0..029dce0e727be0c5246957a0cb6867153b627415 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::turbulenceModel& 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 70d2f7fda2372bfb3e87f5167196e47ab6f3e160..1549fd85e6c211a54a2c5a0e5dbced2357e344c3 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 "turbulenceModel.H"
+#include "RASmodel.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +60,7 @@ protected:
dictionary XiGModelCoeffs_;
const hhuCombustionThermo& thermo_;
- const compressible::turbulenceModel& turbulence_;
+ const compressible::RASmodel& turbulence_;
const volScalarField& Su_;
@@ -91,7 +91,7 @@ public:
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::turbulenceModel& turbulence,
+ const compressible::RASmodel& turbulence,
const volScalarField& Su
),
(
@@ -110,7 +110,7 @@ public:
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::turbulenceModel& turbulence,
+ const compressible::RASmodel& turbulence,
const volScalarField& Su
);
@@ -122,7 +122,7 @@ public:
(
const dictionary& XiGProperties,
const hhuCombustionThermo& thermo,
- const compressible::turbulenceModel& 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 491ddcb2c96013fa5f2d7166ea9aef13d11b3644..0cd7e7b0ccfc93b0846a8a65463c1082f5e5d5b2 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::turbulenceModel& 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::turbulenceModel& 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 43a906ad502ea1c3186a2bc4cc11801edea2dd55..3d98e02da51189df8b521a011e5b87f813f3256a 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::turbulenceModel& 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 f29abd21229a075d74950a15fe2f9466e6fb0cb9..03214e8eec43e25d75fc472a2da516f8bf47be3b 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::turbulenceModel& 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 ba1ef06d264ea4fd3349d744cd0e823ecfa2d2dc..5fee002dd0946f2ac2397bcdd9be18b5c7b60bc0 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::turbulenceModel& 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 8882f6dd82704c3528e088536681fcb2553d39ab..b3b8c021b6fbf794efbe95a8ed32040860b8929d 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 "turbulenceModel.H"
+#include "RASmodel.H"
#include "multivariateSurfaceInterpolationScheme.H"
#include "runTimeSelectionTables.H"
@@ -61,7 +61,7 @@ protected:
dictionary XiModelCoeffs_;
const hhuCombustionThermo& thermo_;
- const compressible::turbulenceModel& 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::turbulenceModel& 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::turbulenceModel& 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::turbulenceModel& 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 2bbcc969105347421cf7e3a52a76cb9d362bb7f2..774ef73621899a1dfba4afe36e77d638a4dff4b4 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::turbulenceModel& 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 db0679fcc889b7a647d19243247c254bad4d56f6..72087b83ae4676883bf96324ff22d57885956a20 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::turbulenceModel& 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 f1f59968aca2f11e469937f17e34ee1b0797518e..65790864966229d2a5a6cc7da1e40ff781683ee2 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::turbulenceModel& 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 a71268db3284c9d8eb14bad7d506786efccb4616..0ff4b90c14d8a3568e2284dbd2de798fb3e1ea08 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::turbulenceModel& 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 87f570ecda12c558e8510f5ace6aac59a2f1bd76..d963111d437bf2aad9ce479873f7e70a0f9be050 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::turbulenceModel& 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 dbc909f0c4ffdbfbda9e0ea4087e423d35045425..19914fe9937744ffaafb45a97de76c38451feeb3 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::turbulenceModel& 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 890177b3a7893b07e995d595ed567ece8b27386a..4394d1a5995caa9f4064170ebfcc7e6c65a45909 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::turbulenceModel& 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 7df894a714b89bc4de258a1db02a83b00150cd91..f593fe44ee70ce18eee022aa3e0a3a3afa63f016 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 035e4db68076c325d623a039507b9b75c4ac6de4..ddf37d4644723b1492f8fb1cb778860a027426be 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/turbulenceModel/turbulenceModel.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 3dede02e04744daff4b0a3e23bcb751eabb5b4d0..1fc0e978ba0845314201420d7ff0867640259e43 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index cf9f9a4768472b3719fe8b134058d3dfc73037d1..d8afa9055b02ea5071ef73c8cfd83bd492b9fab4 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 "turbulenceModel.H"
+#include "RASmodel.H"
#include "OFstream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H
index 7a369df4721e96dd98cf3d86d3d581d86ba59ef2..bbd63d6afaf0f3f0129dcd638deb8effafb5a077 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/combustion/dieselEngineFoam/createFields.H b/applications/solvers/combustion/dieselEngineFoam/createFields.H
index 3291f9fdd152e1070b107b73ebfa247754b7022f..be045381c0e471b0c99f20c994634a051333149f 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::turbulenceModel> turbulence
+autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index cb871e5cdfbfc54e019f1a48fd759e0560ef8b93..3256de1de5c0435de848016c5fa2650d78855585 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/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
#include "spray.H"
#include "chemistryModel.H"
#include "chemistrySolver.H"
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 043ed091bb6714b0a3075146bc9fdc8e9e286f9f..c0041f1cd2a367aec682e0f2c7db41cd98029dc1 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/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
#include "spray.H"
#include "chemistryModel.H"
#include "chemistrySolver.H"
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index 6dcda424df4f6df08765caba2a39c00953e7765f..9f9d693b5b89e988f14b60374e15e3f1b2b134bb 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 "turbulenceModel.H"
+#include "RASmodel.H"
#include "laminarFlameSpeed.H"
#include "ignition.H"
#include "Switch.H"
diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H
index 3291f9fdd152e1070b107b73ebfa247754b7022f..be045381c0e471b0c99f20c994634a051333149f 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::turbulenceModel> turbulence
+autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 63bfc063acd0c0312a06ae68b6522596efd61461..424f032b2ef7ce1faf4108d1ed958501ef2097b7 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/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
#include "chemistryModel.H"
#include "chemistrySolver.H"
#include "multivariateScheme.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index dbc07b4f1a64805bd5315248fe64d2496c133f8a..4e2e34728e297af5eb07a7087bfb2bb63706953b 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 0be52e772f2a02bb29f59a43b18d5e0b01d2553b..0e621d47731ed33d32a38e9eaa9bf1f58a66ded2 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/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
#include "fixedGradientFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
index 478c51e297f2a3e206c0cf5be81f4f1abfdd9ad3..2ba7cbb0b907ddba1e1c3898d07ae9a708ef7bb7 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index c46fad3e7a9562af3605f4331c69d78c8a6a5565..d552558f146438b21b8d93ed8cc10a2e38d0d6d6 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/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
#include "porousZones.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index ec4e648008a67d45f4f48a9adafcb4befd014e64..45fc80e49707dab8fa9113cadf2245704e5e19cc 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index 652e29de43d7727da93f3381f407e0e63b869834..c73d0ddfd5153494e19672e29d3ed3e5288eb80f 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/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
#include "fixedGradientFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoTurbFoam/createFields.H b/applications/solvers/compressible/rhoTurbFoam/createFields.H
index b18995bf64ea1d8d83258ebfcf81489722521af0..bf6087a1a7413bdff0a3ab5951452bd869065751 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/rhoTurbFoam/rhoTurbFoam.C b/applications/solvers/compressible/rhoTurbFoam/rhoTurbFoam.C
index d2bbfd6db2303e86aa84c9589abdfa5137c5fc2c..7231790ce544c78eaac051cf747dcbb88afdd40a 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/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/sonicTurbFoam/createFields.H b/applications/solvers/compressible/sonicTurbFoam/createFields.H
index be2abd6607b953c2684cc977c68e3c171e1f6a70..acfb55a7f92aea123400467678098c6201f56079 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/compressible/sonicTurbFoam/sonicTurbFoam.C b/applications/solvers/compressible/sonicTurbFoam/sonicTurbFoam.C
index 2294847f44c72a8a712e37906c3a7586fb128bb4..03d247c05408b8766ec0fbae8cccb6375792d0fb 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/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C b/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C
index 728e19e2e0e89f00b7841ecc2b563cfcddc4404e..8e513e8b615b1a7fe84122f905869c107d04d086 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/turbulenceModel/turbulenceModel.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 cd463848d8800090026a70cf73e00d2c79831b56..b3a677f28f1841892117554898dad9f6711503be 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index 7b26221067d4a05bc8b76ac7ca98a072cbfd52c1..fa2b66ae7f9fa8eea2ec7379cbd323a12bbffb5b 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/turbulenceModel/turbulenceModel.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 c3b9969962aa1996e47b7f3e7e9bbe8fc9d51114..d93d63af0c9d1f07b2bcb5c81fc3bc2be2198e3e 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index 649a7d97b0d7d45e34f0273bd5eadb150f55d30b..621d2a5cafd753c287a609d52bc9e37f245f2acf 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/turbulenceModel/turbulenceModel.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 707ef2fff88f99d71e627e5dd55402d83382a6bf..499b31a18e4aaffb7319381afa5005db53fb7e6b 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::turbulenceModel> turbulence
+ autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index b8151196305023ca58530101a7ca4dd4c0469fd4..1ce7dbb29ea8202645c5d4b3e330844fecc0c538 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/turbulenceModel/turbulenceModel.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 73c51deeecef39b0731350481be819a85218d013..a08912bf618cac9903b567a653617a94c36ef674 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::turbulenceModel> 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::turbulenceModel>
+ autoPtr<compressible::RASmodel>
(
- compressible::turbulenceModel::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 9c9ba030c324abe46f988055018cb87f5c7553b0..ebd1d3284854d9f29f7fc784f701ef2191f6ec7f 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::turbulenceModel& 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 22a8b2e65ebd81578dd5631cff178dd0743107f9..69699675b16352c2e234c69592cb7252c8601206 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::turbulenceModel& turb
+ const compressible::RASmodel& turb
)
{
// Solve the Momentum equation
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index 134949ba4873a34aef0bf51e2b300206731fe3ea..e51c47e5f1eb64aa300dc429c98ed7589ba34b6d 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/turbulenceModel/turbulenceModel.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 31c3ac591555b8c68d7a16fe70bb6b8be9cb8e9d..3a1624e6effd65c5edd1d89facd3689b5896d9f9 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::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::RASmodel::New(U, phi, laminarTransport)
);
diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H
index 020d1798393c662c639a0617376b1244ecb6f382..3cf08533706db57691340a784f5936ec8380b87d 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::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::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 a3eaf910348c574c728faaa6ec21a4137b193053..6f8788516353022a77392ab6f605291d406c4f21 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/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/incompressible/turbDyMFoam/createFields.H b/applications/solvers/incompressible/turbDyMFoam/createFields.H
index ff3f9c51696c506eb51878d4e8a07b0837b0b89e..2879da8e103f59cdbc0e7844045c82e826e24b46 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::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::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 994cfc100c7c8425aa16f6cf40f5d7678401697b..db8496d0772e0196c4f6023c8b8921fe373cf50b 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/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
#include "dynamicFvMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/incompressible/turbFoam/createFields.H b/applications/solvers/incompressible/turbFoam/createFields.H
index 7cae304f6f6d018824d5dba8ebbf3598fff7c3ad..82ba461ef8b9be7c6dac624006928f9d6888a51c 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::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::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 f9bc79b422e28b51db07052facd42cd7af74fe0b..e67f5ee48e075df564fe830d5dc5831909e1219c 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/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/interDyMFoam/createFields.H b/applications/solvers/multiphase/interDyMFoam/createFields.H
index 48e8f1da205ac0ceaf6d9200672b454628fa5ca9..43e3f82af82a49b16afdd2810f913005d5331c06 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::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::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 053a9fa813a3ec26642d666cea1a801fef70f7d2..c10bdf64de79e24e28fa49e51271c43ea2a8b26e 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/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
#include "probes.H"
#include "EulerDdtScheme.H"
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/createFields.H b/applications/solvers/multiphase/rasCavitatingFoam/createFields.H
index da236f7673d3488fac79cb8c965f398426503920..ef416c1ca0ea873065c613e3eb8288d8d0a269ac 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::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::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 bcc0b5441cac5bec2d3ae1fe00a14af37a19d45e..81d0e87b1e47b149b9419a27942d04b6f17c4f82 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/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/rasInterFoam/createFields.H b/applications/solvers/multiphase/rasInterFoam/createFields.H
index 8a3e4d22f05a6f1b7b6abbcaab0cde9d4a5deffd..0a3ffd255f9cb9a5766807c3858a22c08e48631f 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::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::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 1c78f70bd82ce4aa694919faa684f048e09e8b37..ef1338ba0330658c3b99eb938822b6a546f667ae 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/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 9d437d43555b2f30ed9f9c6ebd69aba4407dfc02..79891d0f03eb7e939d587a423230fe6de5e0c8ea 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -39,11 +39,11 @@ Description
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
#include "incompressible/LESmodel/LESmodel.H"
#include "basicThermo.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
#include "compressible/LESmodel/LESmodel.H"
@@ -146,11 +146,11 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
singlePhaseTransportModel laminarTransport(U, phi);
- if (turbulenceProperties.found("turbulenceModel"))
+ if (turbulenceProperties.found("RASmodel"))
{
- autoPtr<incompressible::turbulenceModel> turbulenceModel
+ autoPtr<incompressible::RASmodel> RASmodel
(
- incompressible::turbulenceModel::New
+ incompressible::RASmodel::New
(
U,
phi,
@@ -173,7 +173,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
FatalErrorIn(args.executable())
<< "Cannot find turbulence model type in "
- << "turbulenceModel dictionary"
+ << "RASmodel dictionary"
<< nl << exit(FatalError);
}
}
@@ -234,11 +234,11 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
turbulencePropertiesHeader
);
- if (turbulenceProperties.found("turbulenceModel"))
+ if (turbulenceProperties.found("RASmodel"))
{
- autoPtr<compressible::turbulenceModel> turbulenceModel
+ autoPtr<compressible::RASmodel> RASmodel
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
@@ -262,7 +262,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
FatalErrorIn(args.executable())
<< "Cannot find turbulence model type in "
- << "turbulenceModel dictionary"
+ << "RASmodel dictionary"
<< nl << exit(FatalError);
}
}
diff --git a/applications/utilities/postProcessing/turbulence/R/R.C b/applications/utilities/postProcessing/turbulence/R/R.C
index 9978cc1b0ff4e23ea0fe70bbee1fca9fdfc0850d..4bfff36b1d79e9bb14de6b4330f740a09f0933a4 100644
--- a/applications/utilities/postProcessing/turbulence/R/R.C
+++ b/applications/utilities/postProcessing/turbulence/R/R.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/turbulence/R/createFields.H b/applications/utilities/postProcessing/turbulence/R/createFields.H
index 72d049103dafb1869244db5cec4caf740df8c393..3e75357892b4976297954705c7f5695ed3ae9781 100644
--- a/applications/utilities/postProcessing/turbulence/R/createFields.H
+++ b/applications/utilities/postProcessing/turbulence/R/createFields.H
@@ -16,7 +16,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::RASmodel::New(U, phi, laminarTransport)
);
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
index 72d049103dafb1869244db5cec4caf740df8c393..3e75357892b4976297954705c7f5695ed3ae9781 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
@@ -16,7 +16,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::RASmodel::New(U, phi, laminarTransport)
);
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
index 6c2340ae6f5b101b543b886f072b58b40fd968ca..da081e38ff926a8dc6311e0e1903dca3a2ef5eb9 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
@@ -36,7 +36,7 @@ Source files:
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index 52cd861cbd99a6d3741fcb0cf3f4aae9b61bd536..bdd3bca109b6ae4a5499e33bcc8545cde3aa38a5 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -37,10 +37,10 @@ Description
#include "fvc.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
#include "incompressible/LESmodel/LESmodel.H"
#include "basicThermo.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
#include "compressible/LESmodel/LESmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -98,11 +98,11 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
singlePhaseTransportModel laminarTransport(U, phi);
- if (turbulenceProperties.found("turbulenceModel"))
+ if (turbulenceProperties.found("RASmodel"))
{
- autoPtr<incompressible::turbulenceModel> turbulenceModel
+ autoPtr<incompressible::RASmodel> RASmodel
(
- incompressible::turbulenceModel::New
+ incompressible::RASmodel::New
(
U,
phi,
@@ -125,7 +125,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
(
mesh.magSf()
* mesh.surfaceInterpolation::deltaCoeffs()
- * fvc::interpolate(turbulenceModel->nuEff())
+ * fvc::interpolate(RASmodel->nuEff())
)
)
);
@@ -161,7 +161,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
FatalErrorIn(args.executable())
<< "Cannot find turbulence model type in "
- "turbulenceModel dictionary"
+ "RASmodel dictionary"
<< exit(FatalError);
}
}
@@ -235,11 +235,11 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
thermo->rho()
);
- if (turbulenceProperties.found("turbulenceModel"))
+ if (turbulenceProperties.found("RASmodel"))
{
- autoPtr<compressible::turbulenceModel> turbulenceModel
+ autoPtr<compressible::RASmodel> RASmodel
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
@@ -263,7 +263,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
(
mesh.magSf()
* mesh.surfaceInterpolation::deltaCoeffs()
- * fvc::interpolate(turbulenceModel->muEff())
+ * fvc::interpolate(RASmodel->muEff())
)
)
);
@@ -299,7 +299,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
FatalErrorIn(args.executable())
<< "Cannot find turbulence model type in"
- "turbulenceModel dictionary"
+ "RASmodel dictionary"
<< exit(FatalError);
}
}
diff --git a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
index be9b22c9e3c44aa0df42c70f67a471b86e8f25f1..90487c0c5a6ab7965b9db14ac9be1d408ffd28fc 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
+++ b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
@@ -31,7 +31,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H b/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
index cb6fb5be3c0744f32950992f609f15e6c4c6a149..ee9f92cd45f28a84b0b094b32321bc82923d47ce 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
@@ -31,9 +31,9 @@ volVectorField U
#include "compressibleCreatePhi.H"
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::RASmodel> turbulence
(
- compressible::turbulenceModel::New
+ compressible::RASmodel::New
(
rho,
U,
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
index 9e46833b01a91caff1e1b857780318685555f2f2..250d5ba4c42026c65876e6090802c1060fc345f0 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
@@ -34,7 +34,7 @@ Description
#include "fvCFD.H"
#include "hCombustionThermo.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
+#include "compressible/RASmodel/RASmodel.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/createFields.H b/applications/utilities/postProcessing/wall/wallShearStress/createFields.H
index 72d049103dafb1869244db5cec4caf740df8c393..3e75357892b4976297954705c7f5695ed3ae9781 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/createFields.H
+++ b/applications/utilities/postProcessing/wall/wallShearStress/createFields.H
@@ -16,7 +16,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::RASmodel::New(U, phi, laminarTransport)
);
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
index d0cf002c4af215d004027ed415ea0f3a6c232bf5..fce77b77561f7271195bd67ef9076577eed2026a 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
+++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
index 2f53660d1112b5a80128b33ea46a97fd578b0368..68ac0529f6766e8410676268c50c79ef95941111 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "incompressible/RASmodel/RASmodel.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -83,9 +83,9 @@ int main(int argc, char *argv[])
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<incompressible::turbulenceModel> turbulence
+ autoPtr<incompressible::RASmodel> turbulence
(
- incompressible::turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::RASmodel::New(U, phi, laminarTransport)
);
const fvPatchList& patches = mesh.boundary();
diff --git a/src/lagrangian/dieselSpray/Make/options b/src/lagrangian/dieselSpray/Make/options
index ad73efc26c5d139b86877c07782db74ec74287db..247a700715f3e320d753ce241ad35fea46f98ee7 100644
--- a/src/lagrangian/dieselSpray/Make/options
+++ b/src/lagrangian/dieselSpray/Make/options
@@ -1,9 +1,9 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
- -I$(LIB_SRC)/LESmodels/compressible/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C
index b29a1f92e7798317f1603a9e91e32f6d0f1f9221..a314ea8841265d1d140383677076c1db182e5227 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C
@@ -47,7 +47,7 @@ dispersionRASModel::dispersionRASModel
dispersionModel(dict, sm),
turbulence_
(
- sm.mesh().lookupObject<compressible::turbulenceModel>
+ sm.mesh().lookupObject<compressible::RASmodel>
(
"turbulenceProperties"
)
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H
index 0630fd4e5da501713ef2c1db3a38439d4ecf2b06..fe40c028a8664c4788fb6c837f6881d2fd4493b5 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H
@@ -34,7 +34,7 @@ Description
#define dispersionRASModel_H
#include "dispersionModel.H"
-#include "turbulenceModel.H"
+#include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,7 +52,7 @@ class dispersionRASModel
{
// Private data
- const compressible::turbulenceModel& turbulence_;
+ const compressible::RASmodel& turbulence_;
public:
@@ -78,7 +78,7 @@ public:
// Member Functions
- const compressible::turbulenceModel& turbulence() const
+ const compressible::RASmodel& turbulence() const
{
return turbulence_;
}
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index 6c0bd4f51ed69eb873b1c528bef74fc74dca37a6..82e57d5c5ed71defcf96d346d8bfaf28081dd89b 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -10,7 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/compressible/lnInclude
+ -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude
LIB_LIBS = \
-llagrangian \
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index ed38363becbef37b3f87e83a566044800e0ab858..e1154140445cb19d95c9ef70de47ca60034241e3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -40,7 +40,7 @@ Foam::DispersionRASModel<CloudType>::DispersionRASModel
DispersionModel<CloudType>(dict, owner),
turbulence_
(
- owner.mesh().objectRegistry::lookupObject<compressible::turbulenceModel>
+ owner.mesh().objectRegistry::lookupObject<compressible::RASmodel>
(
"turbulenceProperties"
)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
index 4dbf3b67eee13c92439459ebbe6525e505a289ca..79bcbb6ae90e64fbaf9fea923759ce81bc41c9f3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
@@ -33,7 +33,7 @@ Description
#define DispersionRASModel_H
#include "DispersionModel.H"
-#include "turbulenceModel.H"
+#include "RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,7 +54,7 @@ class DispersionRASModel
// Private data
//- Reference to the compressible turbulence model
- const compressible::turbulenceModel& turbulence_;
+ const compressible::RASmodel& turbulence_;
public:
@@ -81,7 +81,7 @@ public:
// Member Functions
//- Return const access to the turbulence model
- const compressible::turbulenceModel& turbulence() const
+ const compressible::RASmodel& turbulence() const
{
return turbulence_;
}