radiationModel: Added "he" argument to the "Sh" function

for consistency with the other energy sources.

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -67,7 +67,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
       - fvm::laplacian(turbulence->alphaEff(), he)
      ==
         Qdot
-      + radiation->Sh(thermo)
+      + radiation->Sh(thermo, he)
       + parcels.Sh(he)
       + surfaceFilm.Sh()
       + fvOptions(rho, he)

applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H

@@ -18,7 +18,7 @@
       - fvm::laplacian(turbulence->alphaEff(), he)
      ==
         rho*(U&g)
-      + radiation->Sh(thermo)
+      + radiation->Sh(thermo, he)
       + fvOptions(rho, he)
     );
 

applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H

@@ -12,7 +12,7 @@
       - fvm::laplacian(turbulence->alphaEff(), he)
      ==
         rho*(U&g)
-      + radiation->Sh(thermo)
+      + radiation->Sh(thermo, he)
       + fvOptions(rho, he)
     );
 

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

@@ -12,7 +12,7 @@
       - fvm::laplacian(turb.alphaEff(), he)
      ==
         rho*(U&g)
-      + rad.Sh(thermo)
+      + rad.Sh(thermo, he)
       + fvOptions(rho, he)
     );
 

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

@@ -18,7 +18,7 @@
       - fvm::laplacian(turb.alphaEff(), he)
      ==
         rho*(U&g)
-      + rad.Sh(thermo)
+      + rad.Sh(thermo, he)
       + fvOptions(rho, he)
     );
 

applications/solvers/heatTransfer/thermoFoam/EEqn.H

@@ -17,7 +17,7 @@
         )
       - fvm::laplacian(alphaEff, he)
      ==
-        radiation->Sh(thermo)
+        radiation->Sh(thermo, he)
       + fvOptions(rho, he)
     );
 

applications/solvers/lagrangian/coalChemistryFoam/EEqn.H

@@ -21,7 +21,7 @@
       + Qdot
       + coalParcels.Sh(he)
       + limestoneParcels.Sh(he)
-      + radiation->Sh(thermo)
+      + radiation->Sh(thermo, he)
       + fvOptions(rho, he)
     );
 

applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H

@@ -20,7 +20,7 @@
         rho*(U&g)
       + parcels.Sh(he)
       + surfaceFilm.Sh()
-      + radiation->Sh(thermo)
+      + radiation->Sh(thermo, he)
       + Qdot
       + fvOptions(rho, he)
     );

applications/solvers/lagrangian/reactingParcelFoam/EEqn.H

@@ -19,7 +19,7 @@
      ==
         rho*(U&g)
       + parcels.Sh(he)
-      + radiation->Sh(thermo)
+      + radiation->Sh(thermo, he)
       + Qdot
       + fvOptions(rho, he)
     );
@@ -35,6 +35,6 @@
     thermo.correct();
     radiation->correct();
 
-    Info<< "T gas min/max   = " << min(T).value() << ", "
+    Info<< "T gas min/max   " << min(T).value() << ", "
         << max(T).value() << endl;
 }

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

@@ -13,7 +13,7 @@
      ==
         rho*(U&g)
       + parcels.Sh(he)
-      + radiation->Sh(thermo)
+      + radiation->Sh(thermo, he)
       + Qdot
       + fvOptions(rho, he)
     );

src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 #include "scatterModel.H"
 #include "sootModel.H"
 #include "fvmSup.H"
-#include "fluidThermo.H"
+#include "basicThermo.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -228,10 +228,10 @@ void Foam::radiation::radiationModel::correct()
 
 Foam::tmp<Foam::fvScalarMatrix> Foam::radiation::radiationModel::Sh
 (
-    fluidThermo& thermo
+    const basicThermo& thermo,
+    const volScalarField& he
 ) const
 {
-    volScalarField& he = thermo.he();
     const volScalarField Cpv(thermo.Cpv());
     const volScalarField T3(pow3(T_));
 

src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ SourceFiles
 namespace Foam
 {
 
-class fluidThermo;
+class basicThermo;
 class fvMesh;
 
 namespace radiation
@@ -224,7 +224,11 @@ public:
             virtual tmp<volScalarField::Internal> Ru() const = 0;
 
             //- Energy source term
-            virtual tmp<fvScalarMatrix> Sh(fluidThermo& thermo) const;
+            virtual tmp<fvScalarMatrix> Sh
+            (
+                const basicThermo& thermo,
+                const volScalarField& he
+            ) const;
 
             //- Temperature source term
             virtual tmp<fvScalarMatrix> ST