From f4b2b04f580d4e6a33b7649cc3c623a8b8004bb3 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 17 Jun 2008 17:28:12 +0100
Subject: [PATCH] consistency update
---
.../solvers/combustion/PDRFoam/PDRFoam.C | 2 +-
.../combustion/PDRFoam/PDRFoamAutoRefine.C | 2 +-
.../basicXiSubXiEq/basicXiSubXiEq.C | 2 +-
.../basicXiSubXiEq/basicXiSubXiEq.H | 2 +-
.../XiGModels/basicXiSubG/basicXiSubG.C | 2 +-
.../XiGModels/basicXiSubG/basicXiSubG.H | 2 +-
.../dragModels/PDRDragModel/PDRDragModel.C | 2 +-
.../dragModels/PDRDragModel/PDRDragModel.H | 10 +++---
.../dragModels/PDRDragModel/newPDRDragModel.C | 2 +-
.../PDRModels/dragModels/basic/basic.C | 2 +-
.../PDRModels/dragModels/basic/basic.H | 2 +-
.../turbulence/PDRkEpsilon/PDRkEpsilon.C | 32 +++++++++----------
.../turbulence/PDRkEpsilon/PDRkEpsilon.H | 4 +--
.../XiModels/XiEqModels/Gulder/Gulder.C | 2 +-
.../XiModels/XiEqModels/Gulder/Gulder.H | 2 +-
.../SCOPEBlendXiEq/SCOPEBlendXiEq.C | 2 +-
.../SCOPEBlendXiEq/SCOPEBlendXiEq.H | 2 +-
.../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C | 2 +-
.../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H | 2 +-
.../XiModels/XiEqModels/XiEqModel/XiEqModel.C | 2 +-
.../XiModels/XiEqModels/XiEqModel/XiEqModel.H | 10 +++---
.../XiEqModels/XiEqModel/newXiEqModel.C | 4 +--
.../instabilityXiEq/instabilityXiEq.C | 2 +-
.../instabilityXiEq/instabilityXiEq.H | 2 +-
.../PDRFoam/XiModels/XiGModels/KTS/KTS.C | 2 +-
.../PDRFoam/XiModels/XiGModels/KTS/KTS.H | 2 +-
.../XiModels/XiGModels/XiGModel/XiGModel.C | 2 +-
.../XiModels/XiGModels/XiGModel/XiGModel.H | 10 +++---
.../XiModels/XiGModels/XiGModel/newXiGModel.C | 4 +--
.../XiGModels/instabilityG/instabilityG.C | 2 +-
.../XiGModels/instabilityG/instabilityG.H | 2 +-
.../PDRFoam/XiModels/XiModel/XiModel.C | 2 +-
.../PDRFoam/XiModels/XiModel/XiModel.H | 10 +++---
.../PDRFoam/XiModels/XiModel/newXiModel.C | 2 +-
.../PDRFoam/XiModels/algebraic/algebraic.C | 2 +-
.../PDRFoam/XiModels/algebraic/algebraic.H | 2 +-
.../combustion/PDRFoam/XiModels/fixed/fixed.C | 2 +-
.../combustion/PDRFoam/XiModels/fixed/fixed.H | 2 +-
.../PDRFoam/XiModels/transport/transport.C | 2 +-
.../PDRFoam/XiModels/transport/transport.H | 2 +-
.../solvers/combustion/PDRFoam/createFields.H | 4 +--
.../solvers/combustion/XiFoam/XiFoam.C | 2 +-
.../solvers/combustion/XiFoam/createFields.H | 4 +--
.../coldEngineFoam/coldEngineFoam.C | 2 +-
.../combustion/coldEngineFoam/createFields.H | 4 +--
.../dieselEngineFoam/createFields.H | 4 +--
.../dieselEngineFoam/dieselEngineFoam.C | 2 +-
.../combustion/dieselFoam/dieselFoam.C | 2 +-
.../combustion/engineFoam/engineFoam.C | 2 +-
.../combustion/reactingFoam/createFields.H | 4 +--
.../combustion/reactingFoam/reactingFoam.C | 2 +-
.../compressible/rhoPimpleFoam/createFields.H | 4 +--
.../rhoPimpleFoam/rhoPimpleFoam.C | 2 +-
.../rhoPorousSimpleFoam/createFields.H | 4 +--
.../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 2 +-
.../compressible/rhoSimpleFoam/createFields.H | 4 +--
.../rhoSimpleFoam/rhoSimpleFoam.C | 2 +-
.../compressible/rhoTurbFoam/createFields.H | 4 +--
.../compressible/rhoTurbFoam/rhoTurbFoam.C | 2 +-
.../compressible/sonicTurbFoam/createFields.H | 4 +--
.../sonicTurbFoam/sonicTurbFoam.C | 2 +-
.../heatTransfer/buoyantFoam/buoyantFoam.C | 2 +-
.../heatTransfer/buoyantFoam/createFields.H | 4 +--
.../buoyantSimpleFoam/buoyantSimpleFoam.C | 2 +-
.../buoyantSimpleFoam/createFields.H | 4 +--
.../buoyantSimpleRadiationFoam.C | 2 +-
.../buoyantSimpleRadiationFoam/createFields.H | 4 +--
.../chtMultiRegionFoam/chtMultiRegionFoam.C | 2 +-
.../fluid/createFluidFields.H | 6 ++--
.../fluid/solveEnthalpyEquation.C | 2 +-
.../fluid/solveMomentumEquation.C | 2 +-
.../boundaryFoam/boundaryFoam.C | 2 +-
.../boundaryFoam/createFields.H | 4 +--
.../incompressible/simpleFoam/createFields.H | 4 +--
.../incompressible/simpleFoam/simpleFoam.C | 2 +-
.../incompressible/turbDyMFoam/createFields.H | 4 +--
.../incompressible/turbDyMFoam/turbDyMFoam.C | 2 +-
.../incompressible/turbFoam/createFields.H | 4 +--
.../incompressible/turbFoam/turbFoam.C | 2 +-
.../multiphase/interDyMFoam/createFields.H | 4 +--
.../multiphase/interDyMFoam/interDyMFoam.C | 2 +-
.../rasCavitatingFoam/createFields.H | 4 +--
.../rasCavitatingFoam/rasCavitatingFoam.C | 2 +-
.../multiphase/rasInterFoam/createFields.H | 4 +--
.../multiphase/rasInterFoam/rasInterFoam.C | 2 +-
.../execFlowFunctionObjects.C | 20 ++++++------
.../utilities/postProcessing/turbulence/R/R.C | 2 +-
.../turbulence/R/createFields.H | 4 +--
.../createTurbulenceFields/createFields.H | 4 +--
.../createTurbulenceFields.C | 2 +-
.../postProcessing/velocityField/Pe/Pe.C | 24 +++++++-------
.../postProcessing/wall/wallGradU/wallGradU.C | 2 +-
.../wall/wallHeatFlux/createFields.H | 4 +--
.../wall/wallHeatFlux/wallHeatFlux.C | 2 +-
.../wall/wallShearStress/createFields.H | 4 +--
.../wall/wallShearStress/wallShearStress.C | 2 +-
.../postProcessing/wall/yPlusRAS/yPlusRAS.C | 6 ++--
src/lagrangian/dieselSpray/Make/options | 6 ++--
.../dispersionRASModel/dispersionRASModel.C | 2 +-
.../dispersionRASModel/dispersionRASModel.H | 6 ++--
src/lagrangian/intermediate/Make/options | 2 +-
.../DispersionRASModel/DispersionRASModel.C | 2 +-
.../DispersionRASModel/DispersionRASModel.H | 6 ++--
103 files changed, 191 insertions(+), 191 deletions(-)
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index a9a4dcff780..2a1dff68524 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 a8427f77b1d..8734c86b5ea 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 b72598cdc07..462152ebb5e 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 6c0097e7e6d..d7ebb38267b 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 ab9d69148f1..802caf3cbfb 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 2bb411bb979..9e5d8334f11 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 27cb3b91721..aa37217fceb 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 f5f94c69501..b66632cd611 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 5cc0dd4af88..f099e94a5e1 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 76077d0a269..8ea763f8b73 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 8c4b6cc600f..cf68c7c2280 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 357e749e987..244e7858be4 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 7b207abeb44..f093e2f84f6 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 2c0a75b105b..15737f63794 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 f5f7d629459..5d2b28d7c39 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 ce985b05281..2b75efb54eb 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 841ea1abb34..d490dfdb959 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 48c98dafc3b..5536ad8890c 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 d4181e26b74..3e9c04e522c 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 4e5169835af..9d3d6b05d48 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 f26c1d61c4b..423b61ca970 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 32da0553026..a8885e56ef0 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 cbd9fadbc18..4f42953aa92 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 1c480f164fe..249a1910c9e 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 cc8dae2d735..d71b810bbec 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 aba5e5d6f41..6c9a3963e3f 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 ac028878a05..029dce0e727 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 70d2f7fda23..1549fd85e6c 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 491ddcb2c96..0cd7e7b0ccf 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 43a906ad502..3d98e02da51 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 f29abd21229..03214e8eec4 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 ba1ef06d264..5fee002dd09 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 8882f6dd827..b3b8c021b6f 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 2bbcc969105..774ef736218 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 db0679fcc88..72087b83ae4 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 f1f59968aca..65790864966 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 a71268db328..0ff4b90c14d 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 87f570ecda1..d963111d437 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 dbc909f0c4f..19914fe9937 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 890177b3a78..4394d1a5995 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 7df894a714b..f593fe44ee7 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 035e4db6807..ddf37d46447 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 3dede02e047..1fc0e978ba0 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 cf9f9a47684..d8afa9055b0 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 7a369df4721..bbd63d6afaf 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 3291f9fdd15..be045381c0e 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 cb871e5cdfb..3256de1de5c 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 043ed091bb6..c0041f1cd2a 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 6dcda424df4..9f9d693b5b8 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 3291f9fdd15..be045381c0e 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 63bfc063acd..424f032b2ef 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 dbc07b4f1a6..4e2e34728e2 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 0be52e772f2..0e621d47731 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 478c51e297f..2ba7cbb0b90 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 c46fad3e7a9..d552558f146 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 ec4e648008a..45fc80e4970 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 652e29de43d..c73d0ddfd51 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 b18995bf64e..bf6087a1a74 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 d2bbfd6db23..7231790ce54 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 be2abd6607b..acfb55a7f92 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 2294847f44c..03d247c0540 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 728e19e2e0e..8e513e8b615 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 cd463848d88..b3a677f28f1 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 7b26221067d..fa2b66ae7f9 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 c3b9969962a..d93d63af0c9 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 649a7d97b0d..621d2a5cafd 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 707ef2fff88..499b31a18e4 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 b8151196305..1ce7dbb29ea 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 73c51deeece..a08912bf618 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 9c9ba030c32..ebd1d328485 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 22a8b2e65eb..69699675b16 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 134949ba487..e51c47e5f1e 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 31c3ac59155..3a1624e6eff 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 020d1798393..3cf08533706 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 a3eaf910348..6f878851635 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 ff3f9c51696..2879da8e103 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 994cfc100c7..db8496d0772 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 7cae304f6f6..82ba461ef8b 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 f9bc79b422e..e67f5ee48e0 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 48e8f1da205..43e3f82af82 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 053a9fa813a..c10bdf64de7 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 da236f7673d..ef416c1ca0e 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 bcc0b5441ca..81d0e87b1e4 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 8a3e4d22f05..0a3ffd255f9 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 1c78f70bd82..ef1338ba033 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 9d437d43555..79891d0f03e 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 9978cc1b0ff..4bfff36b1d7 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 72d049103da..3e75357892b 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 72d049103da..3e75357892b 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 6c2340ae6f5..da081e38ff9 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 52cd861cbd9..bdd3bca109b 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 be9b22c9e3c..90487c0c5a6 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 cb6fb5be3c0..ee9f92cd45f 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 9e46833b01a..250d5ba4c42 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 72d049103da..3e75357892b 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 d0cf002c4af..fce77b77561 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 2f53660d111..68ac0529f67 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 ad73efc26c5..247a700715f 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 b29a1f92e77..a314ea88412 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 0630fd4e5da..fe40c028a86 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 6c0bd4f51ed..82e57d5c5ed 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 ed38363becb..e1154140445 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 4dbf3b67eee..79bcbb6ae90 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_;
}
--
GitLab