removed turbulentModel access from sootModel base class

src/thermophysicalModels/radiation/submodels/sootModel/MossBrookesSoot/MossBrookesSoot.C

@@ -138,6 +138,7 @@ Foam::radiation::MossBrookesSoot::MossBrookesSoot
     coeffsDict_(dict.subOrEmptyDict(modelType + "Coeffs")),
     thermo_(mesh.lookupObject<fluidThermo>(basicThermo::dictName)),
     mixture_(checkThermo(thermo_)),
+    turbulence_(mesh.lookupObject<compressibleTurbulenceModel>(turbulenceModel::propertiesName)),
     Snet_
     (
         IOobject
@@ -476,4 +477,11 @@ void Foam::radiation::MossBrookesSoot::calcSource()
 }
 
 
+const Foam::compressibleTurbulenceModel&
+Foam::radiation::MossBrookesSoot::turbulence() const
+{
+    return turbulence_;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/thermophysicalModels/radiation/submodels/sootModel/MossBrookesSoot/MossBrookesSoot.H

@@ -69,6 +69,7 @@ SourceFiles
 
 #include "fluidThermo.H"
 #include "basicSpecieMixture.H"
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -119,6 +120,9 @@ class MossBrookesSoot
         //- Composition
         const basicSpecieMixture& mixture_;
 
+        //- Reference to the turbulence model
+        const compressibleTurbulenceModel &turbulence_;
+
         //- Net rate of soot generation
         volScalarField Snet_;
 
@@ -250,6 +254,9 @@ public:
                 return soot_;
             }
 
+            //- Return access to turbulence
+            const compressibleTurbulenceModel& turbulence() const;
+
             // Soot absorption coefficient
 
                 //- Soot absorption coefficient (net)

src/thermophysicalModels/radiation/submodels/sootModel/khanGreeveSoot/khanGreeveSoot.C

@@ -114,6 +114,7 @@ Foam::radiation::khanGreeveSoot::khanGreeveSoot
     coeffsDict_(dict.subOrEmptyDict(modelType + "Coeffs")),
     thermo_(mesh.lookupObject<fluidThermo>(basicThermo::dictName)),
     mixture_(checkThermo(thermo_)),
+    turbulence_(mesh.lookupObject<compressibleTurbulenceModel>(turbulenceModel::propertiesName)),
     Snet_
     (
         IOobject
@@ -363,4 +364,11 @@ void Foam::radiation::khanGreeveSoot::calcSource()
 }
 
 
+const Foam::compressibleTurbulenceModel&
+Foam::radiation::khanGreeveSoot::turbulence() const
+{
+    return turbulence_;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/thermophysicalModels/radiation/submodels/sootModel/khanGreeveSoot/khanGreeveSoot.H

@@ -64,6 +64,7 @@ SourceFiles
 
 #include "fluidThermo.H"
 #include "basicSpecieMixture.H"
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -108,6 +109,9 @@ class khanGreeveSoot
         //- Composition
         const basicSpecieMixture& mixture_;
 
+        //- Reference to the turbulence model
+        const compressibleTurbulenceModel &turbulence_;
+
         //- Net rate of soot generation
         volScalarField Snet_;
 
@@ -197,6 +201,9 @@ public:
                 return soot_;
             }
 
+            //- Return access to turbulence
+            const compressibleTurbulenceModel& turbulence() const;
+
             // Soot absorption coefficient
 
                 //- Soot absorption coefficient (net)

src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModel.C

@@ -46,8 +46,7 @@ Foam::radiation::sootModel::sootModel
 )
 :
     dict_(dict),
-    mesh_(mesh),
-    turbulence_(mesh.lookupObject<compressibleTurbulenceModel>(turbulenceModel::propertiesName))
+    mesh_(mesh)
 {}
 
 

src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModel.H

@@ -36,7 +36,6 @@ Description
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
 #include "volFields.H"
-#include "turbulentFluidThermoModel.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,9 +64,6 @@ protected:
         //- Reference to the fvMesh
         const fvMesh& mesh_;
 
-        //- Reference to the turbulence model
-        const compressibleTurbulenceModel &turbulence_;
-
 
 public:
 
@@ -161,9 +157,6 @@ public:
                         PtrList<volScalarField>& aj
                     ) const;
 
-                //- Return access to turbulence
-                inline const compressibleTurbulenceModel& turbulence() const;
-
 
 };
 
@@ -175,10 +168,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "sootModelI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //