reactingEulerFoam: Updated handling of thermal diffusivity to support Prandtl number and thermal wall-functions

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

@@ -25,7 +25,7 @@ License
 
 #include "Burns.H"
 #include "phasePair.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "addToRunTimeSelectionTable.H"
 
 #include "dragModel.H"

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

@@ -25,7 +25,7 @@ License
 
 #include "Gosman.H"
 #include "phasePair.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "addToRunTimeSelectionTable.H"
 
 #include "dragModel.H"

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

@@ -25,7 +25,7 @@ License
 
 #include "LopezDeBertodano.H"
 #include "phasePair.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

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

@@ -25,7 +25,7 @@ License
 
 #include "constantTurbulentDispersionCoefficient.H"
 #include "phasePair.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

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

@@ -88,10 +88,7 @@ Foam::AnisothermalPhaseModel<BasePhaseModel>::heEqn()
 
     const volScalarField& contErr(this->continuityError());
 
-    const volScalarField alphaEff
+    const volScalarField alphaEff(this->turbulence().alphaEff());
-    (
-        this->thermo_->alphaEff(this->turbulence().mut())
-    );
 
     volScalarField& he = this->thermo_->he();
 

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

@@ -25,7 +25,7 @@ License
 
 #include "MovingPhaseModel.H"
 #include "phaseSystem.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "fixedValueFvPatchFields.H"
 #include "slipFvPatchFields.H"
 #include "partialSlipFvPatchFields.H"
@@ -176,7 +176,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
     ),
     turbulence_
     (
-        PhaseCompressibleTurbulenceModel<phaseModel>::New
+        phaseCompressibleTurbulenceModel::New
         (
             *this,
             this->thermo().rho(),
@@ -374,7 +374,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::alphaRhoPhi()
 
 
 template<class BasePhaseModel>
-const Foam::PhaseCompressibleTurbulenceModel<Foam::phaseModel>&
+const Foam::phaseCompressibleTurbulenceModel&
 Foam::MovingPhaseModel<BasePhaseModel>::turbulence() const
 {
     return turbulence_;

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

@@ -47,15 +47,13 @@ SourceFiles
 #define MovingPhaseModel_H
 
 #include "phaseModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-template<class TransportModel>
-class PhaseCompressibleTurbulenceModel;
-
 /*---------------------------------------------------------------------------*\
                            Class phaseModel Declaration
 \*---------------------------------------------------------------------------*/
@@ -83,7 +81,7 @@ class MovingPhaseModel
         volVectorField DUDt_;
 
         //- Turbulence model
-        autoPtr<PhaseCompressibleTurbulenceModel<phaseModel> > turbulence_;
+        autoPtr<phaseCompressibleTurbulenceModel> turbulence_;
 
         //- Continuity error
         volScalarField continuityError_;
@@ -178,8 +176,7 @@ public:
         // Turbulence
 
             //- Return the turbulence model
-            virtual const PhaseCompressibleTurbulenceModel<phaseModel>&
+            virtual const phaseCompressibleTurbulenceModel& turbulence() const;
-                turbulence() const;
 };
 
 

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

@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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::phaseCompressibleTurbulenceModel
+
+Description
+    Typedef for phaseCompressibleTurbulenceModel
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phaseCompressibleTurbulenceModel_H
+#define phaseCompressibleTurbulenceModel_H
+
+#include "phaseCompressibleTurbulenceModelFwd.H"
+#include "PhaseCompressibleTurbulenceModel.H"
+#include "ThermalDiffusivity.H"
+#include "phaseModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel> >
+          phaseCompressibleTurbulenceModel;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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::phaseCompressibleTurbulenceModel
+
+Description
+    Forward declaration of typedef for phaseCompressibleTurbulenceModel
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phaseCompressibleTurbulenceModelFwd_H
+#define phaseCompressibleTurbulenceModelFwd_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    class phaseModel;
+
+    template<class TransportModel>
+    class PhaseCompressibleTurbulenceModel;
+
+    template<class BasicTurbulenceModel>
+    class ThermalDiffusivity;
+
+      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel> >
+          phaseCompressibleTurbulenceModel;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -38,6 +38,7 @@ SourceFiles
 #include "surfaceFields.H"
 #include "fvMatricesFwd.H"
 #include "rhoThermo.H"
+#include "phaseCompressibleTurbulenceModelFwd.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -48,9 +49,6 @@ namespace Foam
 class phaseSystem;
 class diameterModel;
 
-template<class TransportModel>
-class PhaseCompressibleTurbulenceModel;
-
 /*---------------------------------------------------------------------------*\
                            Class phaseModel Declaration
 \*---------------------------------------------------------------------------*/
@@ -342,7 +340,7 @@ public:
         // Turbulence
 
             //- Return the turbulence model
-            virtual const PhaseCompressibleTurbulenceModel<phaseModel>&
+            virtual const phaseCompressibleTurbulenceModel&
                 turbulence() const = 0;
 };
 

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C

@@ -23,15 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
-#include "phaseModel.H"
-#include "multiphaseSystem.H"
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
-#include "ThermalDiffusivity.H"
-#include "EddyDiffusivity.H"
-
 #include "laminar.H"
 #include "RASModel.H"
 #include "LESModel.H"

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C

@@ -35,7 +35,7 @@ Description
 
 #include "fvCFD.H"
 #include "twoPhaseSystem.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "pimpleControl.H"
 #include "localEulerDdtScheme.H"

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C

@@ -43,10 +43,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
 :
     eddyViscosity
     <
-        RASModel<EddyDiffusivity<ThermalDiffusivity
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
-        <
-            PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
     >
     (
         type,
@@ -189,10 +186,7 @@ bool Foam::RASModels::kineticTheoryModel::read()
     (
         eddyViscosity
         <
-            RASModel<EddyDiffusivity<ThermalDiffusivity
+            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
-            <
-                PhaseCompressibleTurbulenceModel<phaseModel>
-            > > >
         >::read()
     )
     {

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H

@@ -47,8 +47,7 @@ SourceFiles
 
 #include "RASModel.H"
 #include "eddyViscosity.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
-#include "ThermalDiffusivity.H"
 #include "EddyDiffusivity.H"
 #include "phaseModel.H"
 #include "dragModel.H"
@@ -74,10 +73,7 @@ class kineticTheoryModel
 :
     public eddyViscosity
     <
-        RASModel<EddyDiffusivity<ThermalDiffusivity
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
-        <
-            PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
     >
 {
     // Private data

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C

@@ -23,15 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
-#include "phaseModel.H"
-#include "twoPhaseSystem.H"
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
-#include "ThermalDiffusivity.H"
-#include "EddyDiffusivity.H"
-
 #include "laminar.H"
 #include "RASModel.H"
 #include "LESModel.H"

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C

@@ -42,10 +42,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel
 :
     eddyViscosity
     <
-        RASModel<EddyDiffusivity<ThermalDiffusivity
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
-        <
-            PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
     >
     (
         type,
@@ -93,10 +90,7 @@ bool Foam::RASModels::phasePressureModel::read()
     (
         eddyViscosity
         <
-            RASModel<EddyDiffusivity<ThermalDiffusivity
+            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
-            <
-                PhaseCompressibleTurbulenceModel<phaseModel>
-            > > >
         >::read()
     )
     {

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H

@@ -53,8 +53,7 @@ SourceFiles
 
 #include "RASModel.H"
 #include "eddyViscosity.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
-#include "ThermalDiffusivity.H"
 #include "EddyDiffusivity.H"
 #include "phaseModel.H"
 
@@ -73,10 +72,7 @@ class phasePressureModel
 :
     public eddyViscosity
     <
-        RASModel<EddyDiffusivity<ThermalDiffusivity
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
-        <
-            PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
     >
 {
     // Private data

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C

@@ -25,7 +25,7 @@ License
 
 #include "IATEsource.H"
 #include "fvMatrix.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "uniformDimensionedFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C

@@ -63,6 +63,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
     const alphaField& alpha,
     const volScalarField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
     const word& propertiesName
@@ -76,6 +77,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
             alpha,
             rho,
             U,
+            alphaRhoPhi,
             phi,
             transport,
             propertiesName

src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H

@@ -82,6 +82,7 @@ public:
             const alphaField& alpha,
             const volScalarField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& trasportModel,
             const word& propertiesName = turbulenceModel::propertiesName

src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H

@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "EddyDiffusivity.H"
+
 #define makeBaseTurbulenceModel(                                               \
     Alpha, Rho, baseModel, BaseModel, TDModel, Transport)                      \
                                                                                \