MomentumTransportModels: Update of the TurbulenceModels library for all flow types

providing the shear-stress term in the momentum equation for incompressible and
compressible Newtonian, non-Newtonian and visco-elastic laminar flow as well as
Reynolds averaged and large-eddy simulation of turbulent flow.

The general deviatoric shear-stress term provided by the MomentumTransportModels
library is named divDevTau for compressible flow and divDevSigma (sigma =
tau/rho) for incompressible flow, the spherical part of the shear-stress is
assumed to be either included in the pressure or handled separately.  The
corresponding stress function sigma is also provided which in the case of
Reynolds stress closure returns the effective Reynolds stress (including the
laminar contribution) or for other Reynolds averaged or large-eddy turbulence
closures returns the modelled Reynolds stress or sub-grid stress respectively.
For visco-elastic flow the sigma function returns the effective total stress
including the visco-elastic and Newtonian contributions.

For thermal flow the heat-flux generated by thermal diffusion is now handled by
the separate ThermophysicalTransportModels library allowing independent run-time
selection of the heat-flux model.

During the development of the MomentumTransportModels library significant effort
has been put into rationalising the components and supporting libraries,
removing redundant code, updating names to provide a more logical, consistent
and extensible interface and aid further development and maintenance.  All
solvers and tutorials have been updated correspondingly and backward
compatibility of the input dictionaries provided.

Henry G. Weller
CFD Direct Ltd.

applications/solvers/combustion/PDRFoam/Make/options

@@ -21,11 +21,10 @@ EXE_INC = \
     -IlaminarFlameSpeed/SCOPE \
     -I$(LIB_SRC)/engine/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -37,12 +36,11 @@ EXE_INC = \
 EXE_LIBS = \
     -lengine \
     -lmeshTools \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lspecie \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -llaminarFlameSpeedModels \
     -lfiniteVolume \

applications/solvers/combustion/PDRFoam/PDRFoam.C

@@ -69,7 +69,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiuReactionThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"

applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "psiuReactionThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"
 #include "PDRDragModel.H"

applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ SourceFiles
 
 #include "IOdictionary.H"
 #include "psiuReactionThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "multivariateSurfaceInterpolationScheme.H"
 #include "runTimeSelectionTables.H"
 

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C

@@ -54,7 +54,7 @@ PDRkEpsilon::PDRkEpsilon
     const word& modelName
 )
 :
-    Foam::RASModels::kEpsilon<compressible::turbulenceModel>
+    Foam::RASModels::kEpsilon<compressible::momentumTransportModel>
     (
         geometricOneField(),
         rho,

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H

@@ -61,7 +61,7 @@ SourceFiles
 #define compressible_PDRkEpsilon_H
 
 #include "kEpsilon.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -78,7 +78,7 @@ namespace RASModels
 
 class PDRkEpsilon
 :
-    public Foam::RASModels::kEpsilon<compressible::turbulenceModel>
+    public Foam::RASModels::kEpsilon<compressible::momentumTransportModel>
 {
     // Private Data
 

applications/solvers/combustion/PDRFoam/UEqn.H

@@ -4,7 +4,7 @@
     (
         betav*fvm::ddt(rho, U) + fvm::div(phi, U)
       + MRF.DDt(rho, U)
-      + turbulence->divDevRhoReff(U)
+      + turbulence->divDevTau(U)
      ==
         betav*rho*g
       + betav*fvOptions(rho, U)

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ SourceFiles
 
 #include "IOdictionary.H"
 #include "psiuReactionThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ SourceFiles
 
 #include "IOdictionary.H"
 #include "psiuReactionThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ SourceFiles
 
 #include "IOdictionary.H"
 #include "psiuReactionThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "multivariateSurfaceInterpolationScheme.H"
 #include "fvcDiv.H"
 #include "runTimeSelectionTables.H"

applications/solvers/combustion/XiFoam/Make/options

@@ -1,11 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/engine/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -14,10 +13,9 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lengine \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lspecie \

applications/solvers/combustion/XiFoam/UEqn.H

@@ -4,7 +4,7 @@
     (
         fvm::ddt(rho, U) + fvm::div(phi, U)
       + MRF.DDt(rho, U)
-      + turbulence->divDevRhoReff(U)
+      + turbulence->divDevTau(U)
      ==
         fvOptions(rho, U)
     );

applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options

@@ -5,11 +5,10 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/engine/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude
 
@@ -19,10 +18,9 @@ EXE_LIBS = \
     -lsampling \
     -lmeshTools \
     -lengine \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lspecie \

applications/solvers/combustion/XiFoam/XiEngineFoam/UEqn.H

@@ -2,7 +2,7 @@
     (
         fvm::ddt(rho, U)
       + fvm::div(phi, U)
-      + turbulence->divDevRhoReff(U)
+      + turbulence->divDevTau(U)
      ==
         fvOptions(rho, U)
     );

applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C

@@ -52,7 +52,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "psiuReactionThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -51,7 +51,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiuReactionThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"

applications/solvers/combustion/XiFoam/createFields.H

@@ -47,9 +47,9 @@ volVectorField U
 mesh.setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/combustion/chemFoam/Make/options

@@ -2,7 +2,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude\
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \

applications/solvers/combustion/coldEngineFoam/Make/options

@@ -5,11 +5,10 @@ EXE_INC = \
     -I../../compressible/rhoPimpleFoam \
     -I$(LIB_SRC)/engine/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -17,10 +16,9 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lengine \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lspecie \
     -lfiniteVolume \

applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C

@@ -33,7 +33,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "psiThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "OFstream.H"
 #include "fvOptions.H"

applications/solvers/combustion/coldEngineFoam/createFields.H

@@ -40,9 +40,9 @@ volVectorField U
 
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/combustion/fireFoam/Make/options

@@ -2,12 +2,11 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
@@ -26,11 +25,10 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lspecie \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lSLGThermo \

applications/solvers/combustion/fireFoam/UEqn.H

@@ -4,7 +4,7 @@
     (
         fvm::ddt(rho, U) + fvm::div(phi, U)
       + MRF.DDt(rho, U)
-      + turbulence->divDevRhoReff(U)
+      + turbulence->divDevTau(U)
      ==
         parcels.SU(U)
       + fvOptions(rho, U)

applications/solvers/combustion/fireFoam/createFields.H

@@ -53,9 +53,9 @@ volVectorField U
 
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "basicReactingCloud.H"
 #include "surfaceFilmModel.H"

applications/solvers/combustion/reactingFoam/Make/options

@@ -2,12 +2,11 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
@@ -18,12 +17,11 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lreactionThermophysicalModels \
     -lspecie \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lchemistryModel \
     -lODE \

applications/solvers/combustion/reactingFoam/UEqn.H

@@ -6,7 +6,7 @@ tmp<fvVectorMatrix> tUEqn
 (
     fvm::ddt(rho, U) + fvm::div(phi, U)
   + MRF.DDt(rho, U)
-  + turbulence->divDevRhoReff(U)
+  + turbulence->divDevTau(U)
  ==
     fvOptions(rho, U)
 );

applications/solvers/combustion/reactingFoam/createFields.H

@@ -50,9 +50,9 @@ pressureControl pressureControl(p, rho, pimple.dict(), false);
 mesh.setFluxRequired(p.name());
 
 Info << "Creating turbulence model.\n" << nl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "psiReactionThermo.H"
 #include "CombustionModel.H"

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options

@@ -5,12 +5,11 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
@@ -22,12 +21,11 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lreactionThermophysicalModels \
     -lspecie \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lchemistryModel \
     -lODE \

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/UEqn.H

@@ -4,7 +4,7 @@
     (
         fvm::ddt(rho, U) + fvm::div(phi, U)
       + MRF.DDt(rho, U)
-      + turbulence->divDevRhoReff(U)
+      + turbulence->divDevTau(U)
      ==
         fvOptions(rho, U)
     );

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H

@@ -51,9 +51,9 @@ volScalarField& p = thermo.p();
 mesh.setFluxRequired(p.name());
 
 Info << "Creating turbulence model.\n" << nl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C

@@ -33,7 +33,7 @@ Description
 #include "fvCFD.H"
 #include "rhoReactionThermo.H"
 #include "CombustionModel.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"

applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options

@@ -1,12 +1,11 @@
 EXE_INC = \
     -I. \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
@@ -18,15 +17,14 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude
 
 EXE_LIBS = \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
     -lchemistryModel \
     -lODE \
     -lcombustionModels \
     -lreactionThermophysicalModels \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lfiniteVolume \
     -ldynamicFvMesh \

applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H

@@ -53,9 +53,9 @@ mesh.setFluxRequired(p.name());
 
 
 Info << "Creating turbulence model.\n" << nl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C

@@ -34,7 +34,7 @@ Description
 #include "dynamicFvMesh.H"
 #include "rhoReactionThermo.H"
 #include "CombustionModel.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"

applications/solvers/compressible/rhoCentralFoam/BCs/Make/options

@@ -1,12 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie
 

applications/solvers/compressible/rhoCentralFoam/Make/options

@@ -1,11 +1,10 @@
 EXE_INC = \
     -IBCs/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
@@ -13,12 +12,11 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -lfvOptions \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
     -lrhoCentralFoam \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

applications/solvers/compressible/rhoCentralFoam/createFields.H

@@ -90,9 +90,9 @@ surfaceScalarField neg
 surfaceScalarField phi("phi", fvc::flux(rhoU));
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C

@@ -33,7 +33,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "psiThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "fixedRhoFvPatchScalarField.H"
 #include "directionInterpolate.H"

applications/solvers/compressible/rhoPimpleFoam/Make/options

@@ -1,8 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -11,11 +10,10 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude
 
 EXE_LIBS = \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lfiniteVolume \
     -ldynamicFvMesh \

applications/solvers/compressible/rhoPimpleFoam/UEqn.H

@@ -6,7 +6,7 @@ tmp<fvVectorMatrix> tUEqn
 (
     fvm::ddt(rho, U) + fvm::div(phi, U)
   + MRF.DDt(rho, U)
-  + turbulence->divDevRhoReff(U)
+  + turbulence->divDevTau(U)
  ==
     fvOptions(rho, U)
 );

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -51,9 +51,9 @@ pressureControl pressureControl
 mesh.setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -36,7 +36,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "fluidThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "pimpleControl.H"
 #include "pressureControl.H"

applications/solvers/compressible/rhoSimpleFoam/Make/options

@@ -1,8 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -10,11 +9,10 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
 
 EXE_LIBS = \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lfiniteVolume \
     -lsampling \

applications/solvers/compressible/rhoSimpleFoam/UEqn.H

@@ -6,7 +6,7 @@
     (
         fvm::div(phi, U)
       + MRF.DDt(rho, U)
-      + turbulence->divDevRhoReff(U)
+      + turbulence->divDevTau(U)
      ==
         fvOptions(rho, U)
     );

applications/solvers/compressible/rhoSimpleFoam/createFields.H

@@ -49,9 +49,9 @@ pressureControl pressureControl
 mesh.setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options

@@ -1,10 +1,9 @@
 EXE_INC = \
     -I. \
     -I.. \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -12,11 +11,10 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
 
 EXE_LIBS = \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lfiniteVolume \
     -lsampling \

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H

@@ -6,7 +6,7 @@
     (
         fvm::div(phi, U)
       + MRF.DDt(rho, U)
-      + turbulence->divDevRhoReff(U)
+      + turbulence->divDevTau(U)
      ==
         fvOptions(rho, U)
     );

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "fluidThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "simpleControl.H"
 #include "pressureControl.H"

applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C

@@ -31,7 +31,7 @@ Description
 
 #include "fvCFD.H"
 #include "fluidThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "simpleControl.H"
 #include "pressureControl.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options

@@ -1,11 +1,10 @@
 EXE_INC = \
     -I. \
     -I../../compressible/rhoPimpleFoam \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/radiationModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -14,12 +13,11 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude
 
 EXE_LIBS = \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lradiationModels \
     -lspecie \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lfiniteVolume \
     -ldynamicFvMesh \

applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H

@@ -6,7 +6,7 @@
     (
         fvm::ddt(rho, U) + fvm::div(phi, U)
       + MRF.DDt(rho, U)
-      + turbulence->divDevRhoReff(U)
+      + turbulence->divDevTau(U)
      ==
         fvOptions(rho, U)
     );

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -37,7 +37,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "fluidThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "radiationModel.H"
 #include "pimpleControl.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H

@@ -41,9 +41,9 @@ volVectorField U
 #include "compressibleCreatePhi.H"
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options

@@ -3,11 +3,10 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/radiationModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude
 
 EXE_LIBS = \
@@ -15,11 +14,10 @@ EXE_LIBS = \
     -lfvOptions \
     -lsampling \
     -lmeshTools \
-    -lcompressibleTransportModels \
     -lthermophysicalTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
     -lradiationModels \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lmeshTools

applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H

@@ -6,7 +6,7 @@
     (
         fvm::div(phi, U)
       + MRF.DDt(rho, U)
-      + turbulence->divDevRhoReff(U)
+      + turbulence->divDevTau(U)
      ==
         fvOptions(rho, U)
     );

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "rhoThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "radiationModel.H"
 #include "simpleControl.H"

applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H

@@ -36,9 +36,9 @@ volVectorField U
 #include "compressibleCreatePhi.H"
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options

@@ -9,7 +9,6 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -17,15 +16,14 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
 
 EXE_LIBS = \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
     -lreactionThermophysicalModels \
@@ -33,8 +31,8 @@ EXE_LIBS = \
     -lchemistryModel \
     -lODE \
     -lcombustionModels \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lmeshTools \
     -lfiniteVolume \

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C

@@ -32,7 +32,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "rhoReactionThermo.H"
 #include "CombustionModel.H"

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H

@@ -6,7 +6,7 @@
     (
         fvm::ddt(rho, U) + fvm::div(phi, U)
       + MRF.DDt(rho, U)
-      + turbulence.divDevRhoReff(U)
+      + turbulence.divDevTau(U)
      ==
         fvOptions(rho, U)
     );

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H

@@ -7,7 +7,8 @@ PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
 PtrList<uniformDimensionedScalarField> hRefFluid(fluidRegions.size());
 PtrList<volScalarField> ghFluid(fluidRegions.size());
 PtrList<surfaceScalarField> ghfFluid(fluidRegions.size());
-PtrList<compressible::turbulenceModel> turbulenceFluid(fluidRegions.size());
+PtrList<compressible::momentumTransportModel>
+    turbulenceFluid(fluidRegions.size());
 PtrList<compressible::thermophysicalTransportModel>
     thermophysicalTransportFluid(fluidRegions.size());
 PtrList<CombustionModel<rhoReactionThermo>> reactionFluid(fluidRegions.size());
@@ -150,7 +151,7 @@ forAll(fluidRegions, i)
     turbulenceFluid.set
     (
         i,
-        compressible::turbulenceModel::New
+        compressible::momentumTransportModel::New
         (
             rhoFluid[i],
             UFluid[i],

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H

@@ -27,7 +27,7 @@
     volVectorField& U = UFluid[i];
     surfaceScalarField& phi = phiFluid[i];
 
-    compressible::turbulenceModel& turbulence = turbulenceFluid[i];
+    compressible::momentumTransportModel& turbulence = turbulenceFluid[i];
     compressible::thermophysicalTransportModel& thermophysicalTransport =
         thermophysicalTransportFluid[i];
 

applications/solvers/heatTransfer/thermoFoam/Make/options

@@ -2,11 +2,10 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/radiationModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude
 
 EXE_LIBS = \
@@ -14,10 +13,9 @@ EXE_LIBS = \
     -lsampling \
     -lmeshTools \
     -lfvOptions \
-    -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lradiationModels \
     -lspecie \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lcompressibleTurbulenceModels \
+    -lfluidThermoMomentumTransportModels \
     -lthermophysicalTransportModels

applications/solvers/heatTransfer/thermoFoam/createFields.H

@@ -36,9 +36,9 @@ volVectorField U
 #include "compressibleCreatePhi.H"
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::turbulenceModel> turbulence
+autoPtr<compressible::momentumTransportModel> turbulence
 (
-    compressible::turbulenceModel::New
+    compressible::momentumTransportModel::New
     (
         rho,
         U,

applications/solvers/heatTransfer/thermoFoam/thermoFoam.C

@@ -31,7 +31,7 @@ Description
 
 #include "fvCFD.H"
 #include "rhoThermo.H"
-#include "turbulentFluidThermoModel.H"
+#include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermoTransportModel.H"
 #include "LESModel.H"
 #include "radiationModel.H"

applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options

@@ -1,17 +1,16 @@
 EXE_INC = \
     -IadjointOutletPressure \
     -IadjointOutletVelocity \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
 
 EXE_LIBS = \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleMomentumTransportModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \

applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulentTransportModel.H"
+#include "kinematicMomentumTransportModel.H"
 #include "simpleControl.H"
 #include "fvOptions.H"
 
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
             tmp<fvVectorMatrix> tUEqn
             (
                 fvm::div(phi, U)
-              + turbulence->divDevReff(U)
+              + turbulence->divDevSigma(U)
               + fvm::Sp(alpha, U)
              ==
                 fvOptions(U)
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
             (
                 fvm::div(-phi, Ua)
               - adjointTransposeConvection
-              + turbulence->divDevReff(Ua)
+              + turbulence->divDevSigma(Ua)
               + fvm::Sp(alpha, Ua)
              ==
                 fvOptions(Ua)

applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H

@@ -80,9 +80,9 @@ mesh.setFluxRequired(pa.name());
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::turbulenceModel> turbulence
+autoPtr<incompressible::momentumTransportModel> turbulence
 (
-    incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    incompressible::momentumTransportModel::New(U, phi, laminarTransport)
 );
 
 

applications/solvers/incompressible/boundaryFoam/Make/options

@@ -1,15 +1,14 @@
 EXE_INC = \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleMomentumTransportModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \

applications/solvers/incompressible/boundaryFoam/boundaryFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulentTransportModel.H"
+#include "kinematicMomentumTransportModel.H"
 #include "fvOptions.H"
 #include "wallFvPatch.H"
 #include "makeGraph.H"
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        fvVectorMatrix divR(turbulence->divDevReff(U));
+        fvVectorMatrix divR(turbulence->divDevSigma(U));
         divR.source() = flowMask & divR.source();
 
         fvVectorMatrix UEqn

applications/solvers/incompressible/boundaryFoam/createFields.H

@@ -31,9 +31,9 @@ surfaceScalarField phi
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::turbulenceModel> turbulence
+autoPtr<incompressible::momentumTransportModel> turbulence
 (
-    incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    incompressible::momentumTransportModel::New(U, phi, laminarTransport)
 );
 
 dimensionedVector Ubar("Ubar", dimVelocity, laminarTransport);

applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H

@@ -3,7 +3,7 @@
 
     scalar nu = turbulence->nu()().boundaryField()[patchId][faceId];
     scalar nut = turbulence->nut()().boundaryField()[patchId][faceId];
-    symmTensor R = turbulence->devReff()().boundaryField()[patchId][faceId];
+    symmTensor R = turbulence->devSigma()().boundaryField()[patchId][faceId];
     scalar epsilon = turbulence->epsilon()()[cellId];
 //    scalar omega = turbulence->omega()()[cellId];
     scalar k = turbulence->k()()[cellId];

applications/solvers/incompressible/boundaryFoam/makeGraphs.H

@@ -8,7 +8,7 @@ volSymmTensorField R
         IOobject::NO_READ,
         IOobject::AUTO_WRITE
     ),
-    turbulence->R()
+    turbulence->sigma()
 );
 
 runTime.write();

applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options

@@ -1,6 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 

applications/solvers/incompressible/pimpleFoam/Make/options

@@ -1,8 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
@@ -10,8 +9,8 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
 
 EXE_LIBS = \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleMomentumTransportModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lfvOptions \

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options

@@ -1,17 +1,16 @@
 EXE_INC = \
     -I. \
     -I.. \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleMomentumTransportModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulentTransportModel.H"
+#include "kinematicMomentumTransportModel.H"
 #include "pimpleControl.H"
 #include "SRFModel.H"
 #include "fvOptions.H"

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H

@@ -3,7 +3,7 @@
     (
         fvm::ddt(Urel)
       + fvm::div(phi, Urel)
-      + turbulence->divDevReff(Urel)
+      + turbulence->divDevSigma(Urel)
       + SRF->Su()
      ==
         fvOptions(Urel)

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H

@@ -67,9 +67,9 @@ volVectorField U
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::turbulenceModel> turbulence
+autoPtr<incompressible::momentumTransportModel> turbulence
 (
-    incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    incompressible::momentumTransportModel::New(U, phi, laminarTransport)
 );
 
 #include "createFvOptions.H"

applications/solvers/incompressible/pimpleFoam/UEqn.H

@@ -6,7 +6,7 @@ tmp<fvVectorMatrix> tUEqn
 (
     fvm::ddt(U) + fvm::div(phi, U)
   + MRF.DDt(U)
-  + turbulence->divDevReff(U)
+  + turbulence->divDevSigma(U)
  ==
     fvOptions(U)
 );

applications/solvers/incompressible/pimpleFoam/createFields.H

@@ -39,9 +39,9 @@ mesh.setFluxRequired(p.name());
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::turbulenceModel> turbulence
+autoPtr<incompressible::momentumTransportModel> turbulence
 (
-    incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    incompressible::momentumTransportModel::New(U, phi, laminarTransport)
 );
 
 #include "createMRF.H"

applications/solvers/incompressible/pimpleFoam/pimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulentTransportModel.H"
+#include "kinematicMomentumTransportModel.H"
 #include "pimpleControl.H"
 #include "CorrectPhi.H"
 #include "fvOptions.H"

applications/solvers/incompressible/pisoFoam/Make/options

@@ -1,15 +1,14 @@
 EXE_INC = \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleMomentumTransportModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \

applications/solvers/incompressible/pisoFoam/UEqn.H

@@ -6,7 +6,7 @@ fvVectorMatrix UEqn
 (
     fvm::ddt(U) + fvm::div(phi, U)
   + MRF.DDt(U)
-  + turbulence->divDevReff(U)
+  + turbulence->divDevSigma(U)
  ==
     fvOptions(U)
 );

applications/solvers/incompressible/pisoFoam/createFields.H

@@ -37,9 +37,9 @@ mesh.setFluxRequired(p.name());
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::turbulenceModel> turbulence
+autoPtr<incompressible::momentumTransportModel> turbulence
 (
-    incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    incompressible::momentumTransportModel::New(U, phi, laminarTransport)
 );
 
 #include "createMRF.H"

applications/solvers/incompressible/pisoFoam/pisoFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulentTransportModel.H"
+#include "kinematicMomentumTransportModel.H"
 #include "pisoControl.H"
 #include "fvOptions.H"
 

applications/solvers/incompressible/simpleFoam/Make/options

@@ -1,16 +1,15 @@
 EXE_INC = \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
 EXE_LIBS = \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleMomentumTransportModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options

@@ -1,17 +1,16 @@
 EXE_INC = \
     -I.. \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
 EXE_LIBS = \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleMomentumTransportModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulentTransportModel.H"
+#include "kinematicMomentumTransportModel.H"
 #include "SRFModel.H"
 #include "simpleControl.H"
 #include "fvOptions.H"

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H

@@ -3,7 +3,7 @@
     tmp<fvVectorMatrix> tUrelEqn
     (
         fvm::div(phi, Urel)
-      + turbulence->divDevReff(Urel)
+      + turbulence->divDevSigma(Urel)
       + SRF->Su()
      ==
         fvOptions(Urel)

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H

@@ -64,9 +64,9 @@ volVectorField U
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::turbulenceModel> turbulence
+autoPtr<incompressible::momentumTransportModel> turbulence
 (
-    incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    incompressible::momentumTransportModel::New(U, phi, laminarTransport)
 );
 
 #include "createFvOptions.H"

applications/solvers/incompressible/simpleFoam/UEqn.H

@@ -6,7 +6,7 @@
     (
         fvm::div(phi, U)
       + MRF.DDt(U)
-      + turbulence->divDevReff(U)
+      + turbulence->divDevSigma(U)
      ==
         fvOptions(U)
     );

applications/solvers/incompressible/simpleFoam/createFields.H

@@ -37,9 +37,9 @@ mesh.setFluxRequired(p.name());
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::turbulenceModel> turbulence
+autoPtr<incompressible::momentumTransportModel> turbulence
 (
-    incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    incompressible::momentumTransportModel::New(U, phi, laminarTransport)
 );
 
 #include "createMRF.H"

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options

@@ -1,17 +1,16 @@
 EXE_INC = \
     -I.. \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
 EXE_LIBS = \
-    -lturbulenceModels \
+    -lmomentumTransportModels \
-    -lincompressibleTurbulenceModels \
+    -lincompressibleMomentumTransportModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H

@@ -6,7 +6,7 @@
     (
         fvm::div(phi, U)
       + MRF.DDt(U)
-      + turbulence->divDevReff(U)
+      + turbulence->divDevSigma(U)
       ==
         fvOptions(U)
     );

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulentTransportModel.H"
+#include "kinematicMomentumTransportModel.H"
 #include "simpleControl.H"
 #include "IOporosityModelList.H"
 #include "fvOptions.H"

applications/solvers/incompressible/simpleFoam/simpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulentTransportModel.H"
+#include "kinematicMomentumTransportModel.H"
 #include "simpleControl.H"
 #include "fvOptions.H"
 

applications/solvers/lagrangian/DPMFoam/Allwclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-wclean libso DPMTurbulenceModels
+wclean libso DPMMomentumTransportModels
 
 wclean
 wclean MPPICFoam