ThermophysicalTransportModels: New library to handle the transport of energy and species

The simplistic energy transport support in compressibleTurbulenceModels has been
abstracted and separated into the new ThermophysicalTransportModels library in
order to provide a more general interface to support complex energy and specie
transport models, in particular multi-component diffusion.  Currently only the
Fourier for laminar and eddyDiffusivity for RAS and LES turbulent flows are
provided but the interface is general and the set of models will be expanded in
the near future.

The ThermalDiffusivity and EddyDiffusivity modelling layers remain in
compressibleTurbulenceModels but will be removed shortly and the alphat boundary
conditions will be moved to ThermophysicalTransportModels.

applications/solvers/combustion/PDRFoam/Make/options

@@ -26,6 +26,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
@@ -36,12 +37,13 @@ EXE_INC = \
 EXE_LIBS = \
     -lengine \
     -lmeshTools \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lspecie \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -llaminarFlameSpeedModels \
     -lfiniteVolume \
     -ldynamicFvMesh \

applications/solvers/combustion/PDRFoam/PDRFoam.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
@@ -70,6 +70,7 @@ Description
 #include "fvCFD.H"
 #include "psiuReactionThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"
 #include "PDRDragModel.H"
@@ -140,6 +141,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

applications/solvers/combustion/PDRFoam/createFields.H

@@ -57,6 +57,15 @@ autoPtr<compressible::RASModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::RASThermophysicalTransportModel>
+thermophysicalTransport
+(
+    compressible::RASThermophysicalTransportModel::New
+    (
+        turbulence()
+    )
+);
 
 Info<< "Creating field dpdt\n" << endl;
 volScalarField dpdt

applications/solvers/combustion/XiFoam/EaEqn.H

@@ -15,7 +15,7 @@
             )
           : -dpdt
         )
-      - fvm::laplacian(turbulence->alphaEff(), hea)
+      - fvm::laplacian(thermophysicalTransport->alphaEff(), hea)
       + fvOptions(rho, hea)
     );
 

applications/solvers/combustion/XiFoam/EauEqn.H

@@ -16,7 +16,7 @@ if (ign.ignited())
             )*rho/thermo.rhou()
           : -dpdt*rho/thermo.rhou()
         )
-      - fvm::laplacian(turbulence->alphaEff(), heau)
+      - fvm::laplacian(thermophysicalTransport->alphaEff(), heau)
 
         // These terms cannot be used in partially-premixed combustion due to
         // the resultant inconsistency between ft and heau transport.

applications/solvers/combustion/XiFoam/Make/options

@@ -6,6 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -15,6 +16,7 @@ EXE_LIBS = \
     -lengine \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \

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

@@ -10,6 +10,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude
 
 EXE_LIBS = \
@@ -20,6 +21,7 @@ EXE_LIBS = \
     -lengine \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \

applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.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
@@ -53,6 +53,7 @@ Description
 #include "engineMesh.H"
 #include "psiuReactionThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
 #include "Switch.H"
@@ -127,6 +128,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

applications/solvers/combustion/XiFoam/XiFoam.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
@@ -52,6 +52,7 @@ Description
 #include "fvCFD.H"
 #include "psiuReactionThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
 #include "Switch.H"
@@ -117,6 +118,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

applications/solvers/combustion/XiFoam/bEqn.H

@@ -52,7 +52,7 @@ if (ign.ignited())
       + mvConvection->fvmDiv(phi, b)
       + fvm::div(phiSt, b)
       - fvm::Sp(fvc::div(phiSt), b)
-      - fvm::laplacian(turbulence->alphaEff(), b)
+      - fvm::laplacian(thermophysicalTransport->alphaEff(), b)
      ==
         fvOptions(rho, b)
     );
@@ -103,7 +103,10 @@ if (ign.ignited())
     surfaceScalarField phiXi
     (
         phiSt
-      - fvc::interpolate(fvc::laplacian(turbulence->alphaEff(), b)/mgb)*nf
+      - fvc::interpolate
+        (
+            fvc::laplacian(thermophysicalTransport->alphaEff(), b)/mgb
+        )*nf
       + fvc::interpolate(rho)*fvc::interpolate(Su*(1.0/Xi - Xi))*nf
     );
 

applications/solvers/combustion/XiFoam/createFields.H

@@ -58,6 +58,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating field dpdt\n" << endl;
 volScalarField dpdt
 (

applications/solvers/combustion/XiFoam/ftEqn.H

@@ -17,7 +17,7 @@ if (composition.contains("ft"))
     (
         fvm::ddt(rho, ft)
       + mvConvection->fvmDiv(phi, ft)
-      - fvm::laplacian(turbulence->alphaEff(), ft)
+      - fvm::laplacian(thermophysicalTransport->alphaEff(), ft)
      ==
         fvOptions(rho, ft)
     );

applications/solvers/combustion/coldEngineFoam/Make/options

@@ -10,16 +10,18 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
 
 EXE_LIBS = \
     -lengine \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lspecie \
     -lfiniteVolume \
     -lmeshTools \

applications/solvers/combustion/coldEngineFoam/coldEngineFoam.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,6 +34,7 @@ Description
 #include "engineMesh.H"
 #include "psiThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "OFstream.H"
 #include "fvOptions.H"
 #include "pimpleControl.H"
@@ -95,6 +96,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

applications/solvers/combustion/coldEngineFoam/createFields.H

@@ -51,6 +51,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating field dpdt\n" << endl;
 volScalarField dpdt
 (

applications/solvers/combustion/fireFoam/Make/options

@@ -4,6 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/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 \
@@ -27,6 +28,7 @@ EXE_LIBS = \
     -lsampling \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -23,7 +23,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
             (
                 fvm::ddt(rho, Yi)
               + mvConvection->fvmDiv(phi, Yi)
-              - fvm::laplacian(turbulence->alphaEff(), Yi)
+              - fvm::laplacian(thermophysicalTransport->alphaEff(), Yi)
               ==
                 parcels.SYi(i, Yi)
               + surfaceFilm.Srho(i)
@@ -63,7 +63,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
             )
           : -dpdt
         )
-      - fvm::laplacian(turbulence->alphaEff(), he)
+      - fvm::laplacian(thermophysicalTransport->alphaEff(), he)
      ==
         combustion->Qdot()
       + radiation->Sh(thermo, he)

applications/solvers/combustion/fireFoam/createFields.H

@@ -64,6 +64,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating combustion model\n" << endl;
 autoPtr<CombustionModel<psiReactionThermo>> combustion
 (

applications/solvers/combustion/fireFoam/fireFoam.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
@@ -32,6 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "basicReactingCloud.H"
 #include "surfaceFilmModel.H"
 #include "radiationModel.H"
@@ -98,6 +99,7 @@ int main(int argc, char *argv[])
                 if (pimple.turbCorr())
                 {
                     turbulence->correct();
+                    thermophysicalTransport->correct();
                 }
             }
 

applications/solvers/combustion/reactingFoam/EEqn.H

@@ -15,7 +15,7 @@
             )
           : -dpdt
         )
-      - fvm::laplacian(turbulence->alphaEff(), he)
+      + thermophysicalTransport->divq(he)
      ==
         reaction->Qdot()
       + fvOptions(rho, he)

applications/solvers/combustion/reactingFoam/Make/options

@@ -4,6 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/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 \
@@ -19,6 +20,7 @@ EXE_LIBS = \
     -lsampling \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lreactionThermophysicalModels \
     -lspecie \
     -lcompressibleTransportModels \

applications/solvers/combustion/reactingFoam/YEqn.H

@@ -23,7 +23,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
             (
                 fvm::ddt(rho, Yi)
               + mvConvection->fvmDiv(phi, Yi)
-              - fvm::laplacian(turbulence->alphaEff(), Yi)
+              - fvm::laplacian(thermophysicalTransport->alphaEff(), Yi)
              ==
                 reaction->R(Yi)
               + fvOptions(rho, Yi)

applications/solvers/combustion/reactingFoam/createFields.H

@@ -61,6 +61,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating reaction model\n" << endl;
 autoPtr<CombustionModel<psiReactionThermo>> reaction
 (

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -31,6 +31,7 @@ Description
 
 #include "fvCFD.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "psiReactionThermo.H"
 #include "CombustionModel.H"
 #include "multivariateScheme.H"
@@ -102,6 +103,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

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

@@ -7,6 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/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 \
@@ -23,6 +24,7 @@ EXE_LIBS = \
     -lsampling \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lreactionThermophysicalModels \
     -lspecie \
     -lcompressibleTransportModels \

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

@@ -62,6 +62,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating reaction model\n" << endl;
 autoPtr<CombustionModel<rhoReactionThermo>> reaction
 (

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

@@ -34,6 +34,7 @@ Description
 #include "rhoReactionThermo.H"
 #include "CombustionModel.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
 #include "pressureControl.H"
@@ -104,6 +105,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

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

@@ -3,6 +3,7 @@ EXE_INC = \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/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 \
@@ -26,6 +27,7 @@ EXE_LIBS = \
     -lreactionThermophysicalModels \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lfiniteVolume \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

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

@@ -64,6 +64,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating reaction model\n" << endl;
 autoPtr<CombustionModel<rhoReactionThermo>> reaction
 (

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

@@ -35,6 +35,7 @@ Description
 #include "rhoReactionThermo.H"
 #include "CombustionModel.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
 #include "pressureControl.H"
@@ -157,6 +158,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

applications/solvers/compressible/rhoCentralFoam/Make/options

@@ -6,6 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
@@ -18,6 +19,7 @@ EXE_LIBS = \
     -lrhoCentralFoam \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -lmeshTools

applications/solvers/compressible/rhoCentralFoam/createFields.H

@@ -100,3 +100,9 @@ autoPtr<compressible::turbulenceModel> turbulence
         thermo
     )
 );
+
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);

applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.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
@@ -34,6 +34,7 @@ Description
 #include "dynamicFvMesh.H"
 #include "psiThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "fixedRhoFvPatchScalarField.H"
 #include "directionInterpolate.H"
 #include "localEulerDdtScheme.H"
@@ -248,7 +249,7 @@ int main(int argc, char *argv[])
             solve
             (
                 fvm::ddt(rho, e) - fvc::ddt(rho, e)
-              - fvm::laplacian(turbulence->alphaEff(), e)
+              + thermophysicalTransport->divq(e)
             );
             thermo.correct();
             rhoE = rho*(e + 0.5*magSqr(U));
@@ -261,6 +262,7 @@ int main(int argc, char *argv[])
         rho.boundaryFieldRef() == psi.boundaryField()*p.boundaryField();
 
         turbulence->correct();
+        thermophysicalTransport->correct();
 
         runTime.write();
 

applications/solvers/compressible/rhoPimpleFoam/EEqn.H

@@ -15,7 +15,7 @@
             )
           : -dpdt
         )
-      - fvm::laplacian(turbulence->alphaEff(), he)
+      + thermophysicalTransport->divq(he)
      ==
         fvOptions(rho, he)
     );

applications/solvers/compressible/rhoPimpleFoam/Make/options

@@ -3,6 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -15,6 +16,7 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lfiniteVolume \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -62,6 +62,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating field dpdt\n" << endl;
 volScalarField dpdt
 (

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -37,6 +37,7 @@ Description
 #include "dynamicFvMesh.H"
 #include "fluidThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "pimpleControl.H"
 #include "pressureControl.H"
 #include "CorrectPhi.H"
@@ -162,6 +163,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

applications/solvers/compressible/rhoSimpleFoam/EEqn.H

@@ -9,7 +9,7 @@
           ? fvc::div(phi, volScalarField("Ekp", 0.5*magSqr(U) + p/rho))
           : fvc::div(phi, volScalarField("K", 0.5*magSqr(U)))
         )
-      - fvm::laplacian(turbulence->alphaEff(), he)
+      + thermophysicalTransport->divq(he)
      ==
         fvOptions(rho, he)
     );

applications/solvers/compressible/rhoSimpleFoam/Make/options

@@ -3,6 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -14,6 +15,7 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \

applications/solvers/compressible/rhoSimpleFoam/createFields.H

@@ -60,6 +60,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 dimensionedScalar initialMass = fvc::domainIntegrate(rho);
 
 #include "createMRF.H"

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

@@ -5,6 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -16,6 +17,7 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.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,6 +33,7 @@ Description
 #include "fvCFD.H"
 #include "fluidThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "simpleControl.H"
 #include "pressureControl.H"
 #include "fvOptions.H"
@@ -70,6 +71,7 @@ int main(int argc, char *argv[])
         }
 
         turbulence->correct();
+        thermophysicalTransport->correct();
 
         runTime.write();
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"

applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C

@@ -32,6 +32,7 @@ Description
 #include "fvCFD.H"
 #include "fluidThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "simpleControl.H"
 #include "pressureControl.H"
 #include "fvOptions.H"
@@ -66,6 +67,7 @@ int main(int argc, char *argv[])
         #include "pEqn.H"
 
         turbulence->correct();
+        thermophysicalTransport->correct();
 
         runTime.write();
 

applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H

@@ -15,7 +15,7 @@
             )
           : -dpdt
         )
-      - fvm::laplacian(turbulence->alphaEff(), he)
+      + thermophysicalTransport->divq(he)
      ==
         rho*(U&g)
       + radiation->Sh(thermo, he)

applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options

@@ -6,6 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -19,6 +20,7 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lfiniteVolume \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -38,6 +38,7 @@ Description
 #include "dynamicFvMesh.H"
 #include "fluidThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "radiationModel.H"
 #include "pimpleControl.H"
 #include "pressureControl.H"
@@ -162,6 +163,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H

@@ -52,6 +52,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 
 #include "readGravitationalAcceleration.H"
 #include "readhRef.H"

applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H

@@ -9,7 +9,7 @@
           ? fvc::div(phi, volScalarField("Ekp", 0.5*magSqr(U) + p/rho))
           : fvc::div(phi, volScalarField("K", 0.5*magSqr(U)))
         )
-      - fvm::laplacian(turbulence->alphaEff(), he)
+      + thermophysicalTransport->divq(he)
      ==
         rho*(U&g)
       + radiation->Sh(thermo, he)

applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options

@@ -7,7 +7,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -15,6 +16,7 @@ EXE_LIBS = \
     -lsampling \
     -lmeshTools \
     -lcompressibleTransportModels \
+    -lthermophysicalTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
     -lradiationModels \

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -33,6 +33,7 @@ Description
 #include "fvCFD.H"
 #include "rhoThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "radiationModel.H"
 #include "simpleControl.H"
 #include "pressureControl.H"
@@ -70,6 +71,7 @@ int main(int argc, char *argv[])
         }
 
         turbulence->correct();
+        thermophysicalTransport->correct();
 
         runTime.write();
 

applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H

@@ -47,6 +47,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 
 #include "readGravitationalAcceleration.H"
 #include "readhRef.H"

applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options

@@ -19,6 +19,7 @@ EXE_INC = \
     -I$(LIB_SRC)/combustionModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
@@ -34,6 +35,7 @@ EXE_LIBS = \
     -lcombustionModels \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lmeshTools \
     -lfiniteVolume \
     -lradiationModels \

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.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,6 +33,7 @@ Description
 
 #include "fvCFD.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "rhoReactionThermo.H"
 #include "CombustionModel.H"
 #include "fixedGradientFvPatchFields.H"

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

@@ -15,7 +15,7 @@
             )
           : -dpdt
         )
-      - fvm::laplacian(turbulence.alphaEff(), he)
+      + thermophysicalTransport.divq(he)
      ==
         rho*(U&g)
       + rad.Sh(thermo, he)

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

@@ -42,7 +42,7 @@ if (Y.size())
             (
                 fvm::ddt(rho, Yi)
               + mvConvection->fvmDiv(phi, Yi)
-              - fvm::laplacian(turbulence.alphaEff(), Yi)
+              - fvm::laplacian(thermophysicalTransport.alphaEff(), Yi)
              ==
                 reaction.R(Yi)
               + fvOptions(rho, Yi)

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

@@ -8,6 +8,8 @@ PtrList<uniformDimensionedScalarField> hRefFluid(fluidRegions.size());
 PtrList<volScalarField> ghFluid(fluidRegions.size());
 PtrList<surfaceScalarField> ghfFluid(fluidRegions.size());
 PtrList<compressible::turbulenceModel> turbulenceFluid(fluidRegions.size());
+PtrList<compressible::thermophysicalTransportModel>
+    thermophysicalTransportFluid(fluidRegions.size());
 PtrList<CombustionModel<rhoReactionThermo>> reactionFluid(fluidRegions.size());
 PtrList<volScalarField> p_rghFluid(fluidRegions.size());
 PtrList<radiationModel> radiation(fluidRegions.size());
@@ -157,6 +159,16 @@ forAll(fluidRegions, i)
         ).ptr()
     );
 
+    Info<< "    Adding to thermophysicalTransport\n" << endl;
+    thermophysicalTransportFluid.set
+    (
+        i,
+        compressible::thermophysicalTransportModel::New
+        (
+            turbulenceFluid[i]
+        ).ptr()
+    );
+
     Info<< "    Adding to reactionFluid\n" << endl;
     reactionFluid.set
     (

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

@@ -28,6 +28,9 @@
     surfaceScalarField& phi = phiFluid[i];
 
     compressible::turbulenceModel& turbulence = turbulenceFluid[i];
+    compressible::thermophysicalTransportModel& thermophysicalTransport =
+        thermophysicalTransportFluid[i];
+
     volScalarField& K = KFluid[i];
     volScalarField& dpdt = dpdtFluid[i];
 

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

@@ -22,6 +22,7 @@ else
     if (pimples.pimpleTurbCorr(i))
     {
         turbulence.correct();
+        thermophysicalTransport.correct();
     }
 
     if (!mesh.steady() && pimples.finalPimpleIter())

applications/solvers/heatTransfer/thermoFoam/EEqn.H

@@ -15,7 +15,7 @@
             )
           : -dpdt
         )
-      - fvm::laplacian(alphaEff, he)
+      + thermophysicalTransport->divq(he)
      ==
         radiation->Sh(thermo, he)
       + fvOptions(rho, he)

applications/solvers/heatTransfer/thermoFoam/Make/options

@@ -6,7 +6,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -18,4 +19,5 @@ EXE_LIBS = \
     -lradiationModels \
     -lspecie \
     -lturbulenceModels \
-    -lcompressibleTurbulenceModels
+    -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels

applications/solvers/heatTransfer/thermoFoam/createFields.H

@@ -35,7 +35,23 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-#include "setAlphaEff.H"
+Info<< "Creating turbulence model\n" << endl;
+autoPtr<compressible::turbulenceModel> turbulence
+(
+    compressible::turbulenceModel::New
+    (
+        rho,
+        U,
+        phi,
+        thermo
+    )
+);
+
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
 
 Info<< "Creating field dpdt\n" << endl;
 volScalarField dpdt

applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H

@@ -1,47 +0,0 @@
-Info<< "Creating turbulence model\n" << endl;
-tmp<volScalarField> talphaEff;
-
-IOobject turbulencePropertiesHeader
-(
-    "turbulenceProperties",
-    runTime.constant(),
-    mesh,
-    IOobject::MUST_READ_IF_MODIFIED,
-    IOobject::NO_WRITE,
-    false
-);
-
-if (turbulencePropertiesHeader.typeHeaderOk<IOdictionary>(true))
-{
-    autoPtr<compressible::turbulenceModel> turbulence
-    (
-        compressible::turbulenceModel::New
-        (
-            rho,
-            U,
-            phi,
-            thermo
-        )
-    );
-
-    talphaEff = turbulence->alphaEff();
-}
-else
-{
-    talphaEff = tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "alphaEff",
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh,
-            dimensionedScalar(dimMass/dimLength/dimTime, 0)
-        )
-    );
-}

applications/solvers/heatTransfer/thermoFoam/thermoFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,7 @@ Description
 #include "fvCFD.H"
 #include "rhoThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "LESModel.H"
 #include "radiationModel.H"
 #include "fvOptions.H"
@@ -50,8 +51,6 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createFields.H"
 
-    const volScalarField& alphaEff = talphaEff();
-
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nEvolving thermodynamics\n" << endl;

applications/solvers/lagrangian/coalChemistryFoam/EEqn.H

@@ -15,7 +15,7 @@
             )
           : -dpdt
         )
-      - fvm::laplacian(turbulence->alphaEff(), he)
+      + thermophysicalTransport->divq(he)
      ==
         rho*(U&g)
       + combustion->Qdot()

applications/solvers/lagrangian/coalChemistryFoam/Make/options

@@ -3,6 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
@@ -27,6 +28,7 @@ EXE_LIBS = \
     -lmeshTools \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \

applications/solvers/lagrangian/coalChemistryFoam/YEqn.H

@@ -24,7 +24,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
             (
                 fvm::ddt(rho, Yi)
               + mvConvection->fvmDiv(phi, Yi)
-              - fvm::laplacian(turbulence->alphaEff(), Yi)
+              - fvm::laplacian(thermophysicalTransport->alphaEff(), Yi)
               ==
                 coalParcels.SYi(i, Yi)
               + combustion->R(Yi)

applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.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
@@ -32,6 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "basicThermoCloud.H"
 #include "coalCloud.H"
 #include "psiReactionThermo.H"
@@ -114,6 +115,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

applications/solvers/lagrangian/coalChemistryFoam/createFields.H

@@ -107,6 +107,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating combustion model\n" << endl;
 autoPtr<CombustionModel<psiReactionThermo>> combustion
 (

applications/solvers/lagrangian/reactingParcelFoam/EEqn.H

@@ -15,7 +15,7 @@
             )
           : -dpdt
         )
-      - fvm::laplacian(turbulence->alphaEff(), he)
+      + thermophysicalTransport->divq(he)
      ==
         rho*(U&g)
       + parcels.Sh(he)

applications/solvers/lagrangian/reactingParcelFoam/Make/options

@@ -6,6 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/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 \
@@ -30,6 +31,7 @@ EXE_LIBS = \
     -lmeshTools \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \

applications/solvers/lagrangian/reactingParcelFoam/YEqn.H

@@ -24,7 +24,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
             (
                 fvm::ddt(rho, Yi)
               + mvConvection->fvmDiv(phi, Yi)
-              - fvm::laplacian(turbulence->alphaEff(), Yi)
+              - fvm::laplacian(thermophysicalTransport->alphaEff(), Yi)
               ==
                 parcels.SYi(i, Yi)
               + fvOptions(rho, Yi)

applications/solvers/lagrangian/reactingParcelFoam/createFields.H

@@ -61,6 +61,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating combustion model\n" << endl;
 autoPtr<CombustionModel<rhoReactionThermo>> combustion
 (

applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C

@@ -32,6 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "basicReactingMultiphaseCloud.H"
 #include "surfaceFilmModel.H"
 #include "rhoReactionThermo.H"
@@ -115,6 +116,7 @@ int main(int argc, char *argv[])
                 if (pimple.turbCorr())
                 {
                     turbulence->correct();
+                    thermophysicalTransport->correct();
                 }
             }
         }

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H

@@ -9,7 +9,7 @@
           ? fvc::div(phi, volScalarField("Ekp", 0.5*magSqr(U) + p/rho))
           : fvc::div(phi, volScalarField("K", 0.5*magSqr(U)))
         )
-      - fvm::laplacian(turbulence->alphaEff(), he)
+      + thermophysicalTransport->divq(he)
      ==
         rho*(U&g)
       + parcels.Sh(he)

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options

@@ -4,6 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
@@ -29,6 +30,7 @@ EXE_LIBS = \
     -lmeshTools \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H

@@ -22,7 +22,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
             fvScalarMatrix YEqn
             (
                 mvConvection->fvmDiv(phi, Yi)
-              - fvm::laplacian(turbulence->alphaEff(), Yi)
+              - fvm::laplacian(thermophysicalTransport->alphaEff(), Yi)
              ==
                 parcels.SYi(i, Yi)
               + combustion->R(Yi)

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H

@@ -84,6 +84,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating combustion model\n" << endl;
 autoPtr<CombustionModel<rhoReactionThermo>> combustion
 (

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "basicReactingMultiphaseCloud.H"
 #include "rhoReactionThermo.H"
 #include "CombustionModel.H"
@@ -76,6 +77,7 @@ int main(int argc, char *argv[])
         }
 
         turbulence->correct();
+        thermophysicalTransport->correct();
 
         runTime.write();
 

applications/solvers/lagrangian/sprayFoam/EEqn.H

@@ -15,7 +15,7 @@
             )
           : -dpdt
         )
-      - fvm::laplacian(turbulence->alphaEff(), he)
+      + thermophysicalTransport->divq(he)
      ==
         rho*(U&g)
       + parcels.Sh(he)

applications/solvers/lagrangian/sprayFoam/Make/options

@@ -7,6 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/spray/lnInclude \
@@ -29,6 +30,7 @@ EXE_INC = \
 EXE_LIBS = \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \

applications/solvers/lagrangian/sprayFoam/YEqn.H

@@ -23,7 +23,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
             (
                 fvm::ddt(rho, Yi)
               + mvConvection->fvmDiv(phi, Yi)
-              - fvm::laplacian(turbulence->alphaEff(), Yi)
+              - fvm::laplacian(thermophysicalTransport->alphaEff(), Yi)
              ==
                 parcels.SYi(i, Yi)
               + combustion->R(Yi)

applications/solvers/lagrangian/sprayFoam/createFields.H

@@ -86,6 +86,12 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
+Info<< "Creating thermophysical transport model\n" << endl;
+autoPtr<compressible::thermophysicalTransportModel> thermophysicalTransport
+(
+    compressible::thermophysicalTransportModel::New(turbulence())
+);
+
 Info<< "Creating combustion model\n" << endl;
 autoPtr<CombustionModel<psiReactionThermo>> combustion
 (

applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options

@@ -7,6 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/spray/lnInclude \
@@ -32,6 +33,7 @@ EXE_LIBS = \
     -lsampling \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalTransportModels \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \

applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.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,6 +34,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "turbulentFluidThermoModel.H"
+#include "fluidThermoTransportModel.H"
 #include "basicSprayCloud.H"
 #include "psiReactionThermo.H"
 #include "CombustionModel.H"
@@ -101,6 +102,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

applications/solvers/lagrangian/sprayFoam/sprayFoam.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
@@ -33,6 +33,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "turbulenceModel.H"
+#include "fluidThermoTransportModel.H"
 #include "basicSprayCloud.H"
 #include "psiReactionThermo.H"
 #include "CombustionModel.H"
@@ -143,6 +144,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 turbulence->correct();
+                thermophysicalTransport->correct();
             }
         }
 

applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,11 +43,11 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel
     alphaPhi10_(alphaPhi10)
 {
     {
-        IOdictionary turbulenceProperties
+        IOdictionary momentumTransport
         (
             IOobject
             (
-                turbulenceModel::propertiesName,
+                turbulenceModel::typeName,
                 U.time().constant(),
                 U.db(),
                 IOobject::MUST_READ,
@@ -57,7 +57,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel
 
         word simulationType
         (
-            turbulenceProperties.lookup("simulationType")
+            momentumTransport.lookup("simulationType")
         );
 
         if (simulationType == "twoPhaseTransport")
@@ -140,6 +140,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel
 Foam::tmp<Foam::volScalarField>
 Foam::compressibleInterPhaseTransportModel::alphaEff() const
 {
+    /* ***HGW
     if (twoPhaseTransport_)
     {
         return
@@ -156,6 +157,24 @@ Foam::compressibleInterPhaseTransportModel::alphaEff() const
     {
         return mixture_.alphaEff(turbulence_->alphat());
     }
+    */
+
+    if (twoPhaseTransport_)
+    {
+        return
+            mixture_.alpha1()*mixture_.thermo1().alphaEff
+            (
+                turbulence1_->mut()
+            )
+          + mixture_.alpha2()*mixture_.thermo2().alphaEff
+            (
+                turbulence2_->mut()
+            );
+    }
+    else
+    {
+        return mixture_.alphaEff(turbulence_->mut());
+    }
 }
 
 

applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
     By default the standard mixture transport modelling approach is used in
     which a single momentum stress model (laminar, non-Newtonian, LES or RAS) is
     constructed for the mixture.  However if the \c simulationType in
-    constant/turbulenceProperties is set to \c twoPhaseTransport the alternative
+    constant/momentumTransport is set to \c twoPhaseTransport the alternative
     Euler-Euler two-phase transport modelling approach is used in which separate
     stress models (laminar, non-Newtonian, LES or RAS) are instantiated for each
     of the two phases allowing for different modeling for the phases.

applications/solvers/multiphase/reactingEulerFoam/Allwclean

@@ -5,6 +5,7 @@ wclean libso phaseSystems
 wclean libso interfacialModels
 wclean libso interfacialCompositionModels
 wclean libso phaseCompressibleTurbulenceModels
+wclean libso phaseThermophysicalTransportModels
 reactingTwoPhaseEulerFoam/Allwclean
 reactingMultiphaseEulerFoam/Allwclean
 wclean libso functionObjects

applications/solvers/multiphase/reactingEulerFoam/Allwmake

@@ -8,6 +8,7 @@ wmake $targetType phaseSystems
 wmake $targetType interfacialModels
 wmake $targetType interfacialCompositionModels
 wmake $targetType phaseCompressibleTurbulenceModels
+wmake $targetType phaseThermophysicalTransportModels
 reactingTwoPhaseEulerFoam/Allwmake $targetType $*
 reactingMultiphaseEulerFoam/Allwmake $targetType $*
 wmake $targetType functionObjects

applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ Foam::turbulentDispersionModel::continuousTurbulence() const
         (
             IOobject::groupName
             (
-                turbulenceModel::propertiesName,
+                turbulenceModel::typeName,
                 pair_.continuous().name()
             )
         );

applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C

@@ -211,7 +211,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
         db()
        .lookupObject<IOdictionary>
         (
-            IOobject::groupName("turbulenceProperties", phase.name())
+            IOobject::groupName("momentumTransport", phase.name())
         )
        .subDict("RAS")
        .subDict("kineticTheoryCoeffs")

applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C

@@ -225,7 +225,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
         db()
        .lookupObject<IOdictionary>
         (
-            IOobject::groupName("turbulenceProperties", phase.name())
+            IOobject::groupName("momentumTransport", phase.name())
         )
        .subDict("RAS")
        .subDict("kineticTheoryCoeffs")

applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C

@@ -169,7 +169,6 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField::calcAlphat
     const scalarField& prevAlphat
 ) const
 {
-
     // Lookup the fluid model
     const phaseSystem& fluid =
         db().lookupObject<phaseSystem>("phaseProperties");
@@ -185,7 +184,7 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField::calcAlphat
     const phaseCompressibleTurbulenceModel& turbModel =
         db().lookupObject<phaseCompressibleTurbulenceModel>
         (
-            IOobject::groupName(turbulenceModel::propertiesName, phase.name())
+            IOobject::groupName(turbulenceModel::typeName, phase.name())
         );
 
     const nutWallFunctionFvPatchScalarField& nutw =
@@ -216,7 +215,7 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField::calcAlphat
     const fvPatchScalarField& Tw =
         phase.thermo().T().boundaryField()[patchi];
 
-    scalarField Tp(Tw.patchInternalField());
+    const scalarField Tp(Tw.patchInternalField());
 
     // Heat flux [W/m^2] - lagging alphatw
     const scalarField qDot
@@ -224,19 +223,19 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField::calcAlphat
         (prevAlphat + alphaw)*hew.snGrad()
     );
 
-    scalarField uTau(Cmu25*sqrt(kw));
+    const scalarField uTau(Cmu25*sqrt(kw));
 
-    scalarField yPlus(uTau*y/(muw/rhow));
+    const scalarField yPlus(uTau*y/(muw/rhow));
 
-    scalarField Pr(muw/alphaw);
+    const scalarField Pr(muw/alphaw);
 
     // Molecular-to-turbulent Prandtl number ratio
-    scalarField Prat(Pr/Prt_);
+    const scalarField Prat(Pr/Prt_);
 
     // Thermal sublayer thickness
-    scalarField P(this->Psmooth(Prat));
+    const scalarField P(this->Psmooth(Prat));
 
-    scalarField yPlusTherm(this->yPlusTherm(nutw, P, Prat));
+    const scalarField yPlusTherm(this->yPlusTherm(nutw, P, Prat));
 
     tmp<scalarField> talphatConv(new scalarField(this->size()));
     scalarField& alphatConv = talphatConv.ref();

applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C

@@ -361,7 +361,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
                     (
                         IOobject::groupName
                         (
-                            turbulenceModel::propertiesName,
+                            turbulenceModel::typeName,
                             liquid.name()
                         )
                     );
@@ -370,7 +370,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
                     (
                         IOobject::groupName
                         (
-                            turbulenceModel::propertiesName,
+                            turbulenceModel::typeName,
                             vapor.name()
                         )
                     );

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options

@@ -9,6 +9,7 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C

@@ -26,6 +26,7 @@ License
 #include "MovingPhaseModel.H"
 #include "phaseSystem.H"
 #include "phaseCompressibleTurbulenceModel.H"
+#include "phaseThermophysicalTransportModel.H"
 #include "fixedValueFvPatchFields.H"
 #include "slipFvPatchFields.H"
 #include "partialSlipFvPatchFields.H"
@@ -174,6 +175,10 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
             *this
         )
     ),
+    thermophysicalTransport_
+    (
+        phaseThermophysicalTransportModel::New(turbulence_)
+    ),
     continuityError_
     (
         IOobject
@@ -262,6 +267,7 @@ void Foam::MovingPhaseModel<BasePhaseModel>::correctEnergyTransport()
     BasePhaseModel::correctEnergyTransport();
 
     turbulence_->correctEnergyTransport();
+    thermophysicalTransport_->correct();
 }
 
 
@@ -475,7 +481,7 @@ template<class BasePhaseModel>
 Foam::tmp<Foam::volScalarField>
 Foam::MovingPhaseModel<BasePhaseModel>::kappaEff() const
 {
-    return turbulence_->kappaEff();
+    return thermophysicalTransport_->kappaEff();
 }
 
 
@@ -483,7 +489,7 @@ template<class BasePhaseModel>
 Foam::tmp<Foam::scalarField>
 Foam::MovingPhaseModel<BasePhaseModel>::kappaEff(const label patchi) const
 {
-    return turbulence_->kappaEff(patchi);
+    return thermophysicalTransport_->kappaEff(patchi);
 }
 
 
@@ -491,7 +497,7 @@ template<class BasePhaseModel>
 Foam::tmp<Foam::volScalarField>
 Foam::MovingPhaseModel<BasePhaseModel>::alphaEff() const
 {
-    return turbulence_->alphaEff();
+    return thermophysicalTransport_->alphaEff();
 }
 
 
@@ -499,7 +505,7 @@ template<class BasePhaseModel>
 Foam::tmp<Foam::scalarField>
 Foam::MovingPhaseModel<BasePhaseModel>::alphaEff(const label patchi) const
 {
-    return turbulence_->alphaEff(patchi);
+    return thermophysicalTransport_->alphaEff(patchi);
 }
 
 

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H

@@ -46,6 +46,7 @@ SourceFiles
 
 #include "phaseModel.H"
 #include "phaseCompressibleTurbulenceModel.H"
+#include "phaseThermophysicalTransportModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -89,6 +90,9 @@ protected:
         //- Turbulence model
         autoPtr<phaseCompressibleTurbulenceModel> turbulence_;
 
+        //- Thermophysical transport model
+        autoPtr<phaseThermophysicalTransportModel> thermophysicalTransport_;
+
         //- Continuity error
         volScalarField continuityError_;
 

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseThermophysicalTransportModel.H

@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::phaseThermophysicalTransportModel
+
+Description
+    Typedef for phaseThermophysicalTransportModel
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phaseThermophysicalTransportModel_H
+#define phaseThermophysicalTransportModel_H
+
+#include "PhaseThermophysicalTransportModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+      typedef PhaseThermophysicalTransportModel
+      <
+          phaseCompressibleTurbulenceModel
+      > phaseThermophysicalTransportModel;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H

@@ -234,6 +234,12 @@ public:
             //- Return the thermophysical model
             virtual const rhoThermo& thermo() const = 0;
 
+            //- Cast to the thermophysical model
+            operator const rhoThermo&() const
+            {
+                return thermo();
+            }
+
             //- Access the thermophysical model
             virtual rhoThermo& thermoRef() = 0;
 

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ wallBoiling
         (
             IOobject::groupName
             (
-                turbulenceModel::propertiesName,
+                turbulenceModel::typeName,
                 popBal_.continuousPhase().name()
             )
         )