diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
index a18c9bbb1e6d2e48121247d9099937ff0fcc6b8e..73d8e56e6576311d33e8623b34d541b7d0f86d02 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
@@ -36,7 +36,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-makeTurbulenceModelTypes
+defineTurbulenceModelTypes
(
volScalarField,
geometricOneField,
diff --git a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C
index a92937efec38cf8475f1eaae9e8594d80b24e129..3e35a21a933c7394985ecae54f07a99960bb1d16 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C
+++ b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C
@@ -33,7 +33,9 @@ License
#include "turbulentTransportModel.H"
#include "LESModel.H"
-makeTurbulenceModelTypes
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defineTurbulenceModelTypes
(
volScalarField,
geometricOneField,
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C
index e83bf67b0c4bdaa7adae44ad1ff8ecf1b904c42c..c38736bc7de4c4560b3cf3dc597525f338c6829b 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C
@@ -39,7 +39,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-makeTurbulenceModelTypes
+defineTurbulenceModelTypes
(
volScalarField,
volScalarField,
@@ -71,22 +71,38 @@ makeBaseTurbulenceModel
makeTemplatedTurbulenceModel \
(fluidThermoPhaseCompressibleTurbulenceModel, LES, Type)
+
+// -------------------------------------------------------------------------- //
+// Laminar models
+// -------------------------------------------------------------------------- //
+
#include "Stokes.H"
makeLaminarModel(Stokes);
#include "Maxwell.H"
makeLaminarModel(Maxwell);
+
+// -------------------------------------------------------------------------- //
+// RAS models
+// -------------------------------------------------------------------------- //
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
#include "kOmegaSST.H"
makeRASModel(kOmegaSST);
+
+// -------------------------------------------------------------------------- //
+// LES models
+// -------------------------------------------------------------------------- //
+
#include "Smagorinsky.H"
makeLESModel(Smagorinsky);
#include "kEqn.H"
makeLESModel(kEqn);
+
// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C b/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C
index 40c126ba7c44a720662fbf202ab81df392587630..789e1783dfb184d87366f80ae2e8b0e152d532c6 100644
--- a/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C
@@ -36,7 +36,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-makeTurbulenceModelTypes
+defineTurbulenceModelTypes
(
geometricOneField,
volScalarField,
@@ -78,15 +78,29 @@ makeBaseTurbulenceModel
Type \
)
+// -------------------------------------------------------------------------- //
+// Laminar models
+// -------------------------------------------------------------------------- //
+
#include "Stokes.H"
makeLaminarModel(Stokes);
+
+// -------------------------------------------------------------------------- //
+// RAS models
+// -------------------------------------------------------------------------- //
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
#include "buoyantKEpsilon.H"
makeRASModel(buoyantKEpsilon);
+
+// -------------------------------------------------------------------------- //
+// LES models
+// -------------------------------------------------------------------------- //
+
#include "Smagorinsky.H"
makeLESModel(Smagorinsky);
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/CompressibleMultiPhaseTurbulenceModels.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/CompressibleMultiPhaseTurbulenceModels.C
index 9f85637bdc93e8483a4572ae6505b105e53f7786..5df5277cf129436c6ab9cb5fd8112c736c89ac34 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/CompressibleMultiPhaseTurbulenceModels.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/CompressibleMultiPhaseTurbulenceModels.C
@@ -37,6 +37,18 @@ License
#include "RASModel.H"
#include "LESModel.H"
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defineTurbulenceModelTypes
+(
+ geometricOneField,
+ volScalarField,
+ compressibleTurbulenceModel,
+ CompressibleTurbulenceModel,
+ ThermalDiffusivity,
+ multiphaseSystem
+);
+
makeBaseTurbulenceModel
(
geometricOneField,
@@ -59,16 +71,32 @@ makeBaseTurbulenceModel
makeTemplatedTurbulenceModel \
(multiphaseSystemCompressibleTurbulenceModel, LES, Type)
+
+// -------------------------------------------------------------------------- //
+// Laminar models
+// -------------------------------------------------------------------------- //
+
#include "Stokes.H"
makeLaminarModel(Stokes);
+
+// -------------------------------------------------------------------------- //
+// RAS models
+// -------------------------------------------------------------------------- //
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
+
+// -------------------------------------------------------------------------- //
+// LES models
+// -------------------------------------------------------------------------- //
+
#include "Smagorinsky.H"
makeLESModel(Smagorinsky);
#include "kEqn.H"
makeLESModel(kEqn);
+
// ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
index a91c83e05ca090a2cc71a220c11178c19312ab63..da76d422918981affd0b77a396626673a3e897e8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
@@ -40,7 +40,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-makeTurbulenceModelTypes
+defineTurbulenceModelTypes
(
volScalarField,
volScalarField,
@@ -72,9 +72,19 @@ makeBaseTurbulenceModel
makeTemplatedTurbulenceModel \
(phaseModelPhaseCompressibleTurbulenceModel, LES, Type)
+
+// -------------------------------------------------------------------------- //
+// Laminar models
+// -------------------------------------------------------------------------- //
+
#include "Stokes.H"
makeLaminarModel(Stokes);
+
+// -------------------------------------------------------------------------- //
+// RAS models
+// -------------------------------------------------------------------------- //
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
@@ -93,6 +103,11 @@ makeRASModel(LaheyKEpsilon);
#include "continuousGasKEpsilon.H"
makeRASModel(continuousGasKEpsilon);
+
+// -------------------------------------------------------------------------- //
+// LES models
+// -------------------------------------------------------------------------- //
+
#include "Smagorinsky.H"
makeLESModel(Smagorinsky);
@@ -108,6 +123,11 @@ makeLESModel(NicenoKEqn);
#include "continuousGasKEqn.H"
makeLESModel(continuousGasKEqn);
+
+// -------------------------------------------------------------------------- //
+// Additional models
+// -------------------------------------------------------------------------- //
+
#include "kineticTheoryModel.H"
makeTurbulenceModel
(phaseModelPhaseCompressibleTurbulenceModel, RAS, kineticTheoryModel);
@@ -116,4 +136,5 @@ makeTurbulenceModel
makeTurbulenceModel
(phaseModelPhaseCompressibleTurbulenceModel, RAS, phasePressureModel);
+
// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
index 637a7bb905f28bee5d21543732a19500eecf3621..b6c5ff5239e4fa429b3aa11de2f7153a2c9a733e 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015-2016 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -29,48 +30,52 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makeTurbulenceModelTypes( \
+//- Define turbulence model typedefs, with EddyDiffusivity
+#define defineTurbulenceModelTypes( \
Alpha, Rho, baseModel, BaseModel, TDModel, Transport) \
\
namespace Foam \
{ \
+ typedef TurbulenceModel \
+ < \
+ Alpha, \
+ Rho, \
+ baseModel, \
+ Transport \
+ > Transport##baseModel; \
+ \
typedef TDModel<BaseModel<Transport>> \
Transport##BaseModel; \
+ \
typedef laminarModel<Transport##BaseModel> \
laminar##Transport##BaseModel; \
+ \
typedef RASModel<EddyDiffusivity<Transport##BaseModel>> \
RAS##Transport##BaseModel; \
+ \
typedef LESModel<EddyDiffusivity<Transport##BaseModel>> \
LES##Transport##BaseModel; \
}
+// Legacy name
+#define makeTurbulenceModelTypes(a, b, c, d, e, f) \
+ defineTurbulenceModelTypes(a, b, c, d, e, f)
+
#define makeBaseTurbulenceModel( \
Alpha, Rho, baseModel, BaseModel, TDModel, Transport) \
\
+ /* Uses previously defined typedefs */ \
namespace Foam \
{ \
- typedef TurbulenceModel \
- < \
- Alpha, \
- Rho, \
- baseModel, \
- Transport \
- > Transport##baseModel; \
- \
+ /* Turbulence selection table */ \
defineTemplateRunTimeSelectionTable \
( \
Transport##baseModel, \
dictionary \
); \
\
- typedef TDModel<BaseModel<Transport>> \
- Transport##BaseModel; \
- \
- \
- typedef laminarModel<Transport##BaseModel> \
- laminar##Transport##BaseModel; \
- \
+ /* Laminar models */ \
defineNamedTemplateTypeNameAndDebug(laminar##Transport##BaseModel, 0); \
\
defineTemplateRunTimeSelectionTable \
@@ -83,10 +88,7 @@ License
dictionary \
); \
\
- \
- typedef RASModel<EddyDiffusivity<Transport##BaseModel>> \
- RAS##Transport##BaseModel; \
- \
+ /* RAS models */ \
defineNamedTemplateTypeNameAndDebug(RAS##Transport##BaseModel, 0); \
\
defineTemplateRunTimeSelectionTable \
@@ -100,9 +102,7 @@ License
); \
\
\
- typedef LESModel<EddyDiffusivity<Transport##BaseModel>> \
- LES##Transport##BaseModel; \
- \
+ /* LES model types */ \
defineNamedTemplateTypeNameAndDebug(LES##Transport##BaseModel, 0); \
\
defineTemplateRunTimeSelectionTable \
@@ -139,7 +139,7 @@ License
#define makeTemplatedTurbulenceModel(BaseModel, SType, Type) \
- typedef Foam::SType##Models::Type<Foam::EddyDiffusivity<Foam::BaseModel>> \
+ typedef Foam::SType##Models::Type<Foam::EddyDiffusivity<Foam::BaseModel>> \
Type##SType##BaseModel; \
defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \
\
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
index 9893dd00fe403aef16f20838aaed9870dd635281..7cb0dee4b594129d7f22bdaf5895cc875fbc1630 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@@ -29,6 +29,16 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+defineTurbulenceModelTypes
+(
+ geometricOneField,
+ volScalarField,
+ compressibleTurbulenceModel,
+ CompressibleTurbulenceModel,
+ ThermalDiffusivity,
+ fluidThermo
+);
+
makeBaseTurbulenceModel
(
geometricOneField,
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
index 63b525b0986a515757ea90cc721f3632a723354d..22c7fa5d9c33030e8a9119659bc7939a601b6041 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
@@ -29,6 +29,15 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+defineTurbulenceModelTypes
+(
+ geometricOneField,
+ geometricOneField,
+ incompressibleTurbulenceModel,
+ IncompressibleTurbulenceModel,
+ transportModel
+);
+
makeBaseTurbulenceModel
(
geometricOneField,
diff --git a/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H b/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H
index 882f51974a538180ce079ebc40a17be629c2aa48..6532a40e9f4e787bf3666a7820dc85aa3bfa3556 100644
--- a/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2016 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -25,37 +26,52 @@ License
\*---------------------------------------------------------------------------*/
-#define makeTurbulenceModelTypes(Alpha, Rho, baseModel, BaseModel, Transport) \
+//- Define turbulence model typedefs, with EddyDiffusivity
+#define defineTurbulenceModelTypes( \
+ Alpha, Rho, baseModel, BaseModel, Transport) \
\
namespace Foam \
{ \
- typedef BaseModel<Transport> Transport##BaseModel; \
+ typedef TurbulenceModel \
+ < \
+ Alpha, \
+ Rho, \
+ baseModel, \
+ Transport \
+ > Transport##baseModel; \
+ \
+ typedef BaseModel<Transport> \
+ Transport##BaseModel; \
+ \
typedef laminarModel<Transport##BaseModel> \
laminar##Transport##BaseModel; \
- typedef RASModel<Transport##BaseModel> RAS##Transport##BaseModel; \
- typedef LESModel<Transport##BaseModel> LES##Transport##BaseModel; \
+ \
+ typedef RASModel<Transport##BaseModel> \
+ RAS##Transport##BaseModel; \
+ \
+ typedef LESModel<Transport##BaseModel> \
+ LES##Transport##BaseModel; \
}
+// Legacy name
+#define makeTurbulenceModelTypes(a, b, c, d, e) \
+ defineTurbulenceModelTypes(a, b, c, d, e)
+
#define makeBaseTurbulenceModel(Alpha, Rho, baseModel, BaseModel, Transport) \
+ /* Turbulence typedefs */ \
+ defineTurbulenceModelTypes(Alpha, Rho, baseModel, BaseModel, Transport) \
\
namespace Foam \
{ \
- typedef TurbulenceModel \
- < \
- Alpha, \
- Rho, \
- baseModel, \
- Transport \
- > Transport##baseModel; \
- \
+ /* Turbulence selection table */ \
defineTemplateRunTimeSelectionTable \
( \
Transport##baseModel, \
dictionary \
); \
\
- \
+ /* Laminar models */ \
defineNamedTemplateTypeNameAndDebug(laminar##Transport##BaseModel, 0); \
\
defineTemplateRunTimeSelectionTable \
@@ -68,7 +84,7 @@ License
dictionary \
); \
\
- \
+ /* RAS models */ \
defineNamedTemplateTypeNameAndDebug(RAS##Transport##BaseModel, 0); \
\
defineTemplateRunTimeSelectionTable \
@@ -81,7 +97,7 @@ License
dictionary \
); \
\
- \
+ /* LES models */ \
defineNamedTemplateTypeNameAndDebug(LES##Transport##BaseModel, 0); \
\
defineTemplateRunTimeSelectionTable \
diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
index dc58d73c768be51111f3aac822c0b6864254efd0..ef54664e4a4fa9cdc804d8d8e9f8e990b186a4de 100644
--- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
@@ -35,7 +35,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-makeTurbulenceModelTypes
+defineTurbulenceModelTypes
(
volScalarField,
volScalarField,
@@ -67,15 +67,30 @@ makeBaseTurbulenceModel
makeTemplatedTurbulenceModel \
(phaseModelPhaseCompressibleTurbulenceModel, LES, Type)
+
+// -------------------------------------------------------------------------- //
+// Laminar models
+// -------------------------------------------------------------------------- //
+
#include "Stokes.H"
makeLaminarModel(Stokes);
+
+// -------------------------------------------------------------------------- //
+// RAS models
+// -------------------------------------------------------------------------- //
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
#include "kOmegaSST.H"
makeRASModel(kOmegaSST);
+
+// -------------------------------------------------------------------------- //
+// LES models
+// -------------------------------------------------------------------------- //
+
#include "Smagorinsky.H"
makeLESModel(Smagorinsky);
diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
index f661ffd7622d5a551c65cc929a5523e17e825f22..f6655c18cee86c46c339fd7873adb7fa42ff6822 100644
--- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
@@ -35,7 +35,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-makeTurbulenceModelTypes
+defineTurbulenceModelTypes
(
volScalarField,
volScalarField,
@@ -67,9 +67,19 @@ makeBaseTurbulenceModel
makeTemplatedTurbulenceModel \
(phaseModelPhaseCompressibleTurbulenceModel, LES, Type)
+
+// -------------------------------------------------------------------------- //
+// Laminar models
+// -------------------------------------------------------------------------- //
+
#include "Stokes.H"
makeLaminarModel(Stokes);
+
+// -------------------------------------------------------------------------- //
+// RAS models
+// -------------------------------------------------------------------------- //
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
@@ -94,6 +104,11 @@ makeLESModel(Smagorinsky);
#include "kEqn.H"
makeLESModel(kEqn);
+
+// -------------------------------------------------------------------------- //
+// LES models
+// -------------------------------------------------------------------------- //
+
#include "SmagorinskyZhang.H"
makeLESModel(SmagorinskyZhang);
@@ -103,6 +118,11 @@ makeLESModel(NicenoKEqn);
#include "continuousGasKEqn.H"
makeLESModel(continuousGasKEqn);
+
+// -------------------------------------------------------------------------- //
+// Additional models
+// -------------------------------------------------------------------------- //
+
#include "kineticTheoryModel.H"
makeTurbulenceModel
(phaseModelPhaseCompressibleTurbulenceModel, RAS, kineticTheoryModel);
@@ -111,4 +131,5 @@ makeTurbulenceModel
makeTurbulenceModel
(phaseModelPhaseCompressibleTurbulenceModel, RAS, phasePressureModel);
+
// ************************************************************************* //