radiation: Removed the redundant "radiation off" switch from radiationProperties

To switch-off radiation set

    radiationModel  none;

in radiationProperties which instantiates "null" model that does not read any
data or coefficients or evaluate any fields.

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C

@@ -48,7 +48,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
-#include "radiationModel.H"
+#include "noRadiation.H"
 #include "fvOptions.H"
 #include "pimpleControl.H"
 

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C

@@ -48,7 +48,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
-#include "radiationModel.H"
+#include "noRadiation.H"
 #include "fvOptions.H"
 #include "simpleControl.H"
 

etc/templates/singleFluidCHT/templates/materials/air/radiationProperties

@@ -15,9 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation off;
+radiationModel  none; // P1;
-
-radiationModel  P1;
 
 solverFreq 1;
 

etc/templates/singleFluidCHT/templates/materials/water/radiationProperties

@@ -15,9 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation off;
+radiationModel  none; // P1;
-
-radiationModel  P1;
 
 solverFreq 1;
 

src/thermophysicalModels/radiation/include/createIncompressibleRadiationModel.H

@@ -10,7 +10,7 @@
         1.0
     );
 
-    if (radiation->radiation())
+    if (!isType<radiation::noRadiation>(radiation()))
     {
         IOdictionary transportProperties
         (

src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C

@@ -68,16 +68,20 @@ Foam::radiation::noRadiation::~noRadiation()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::radiation::noRadiation::read()
+void Foam::radiation::noRadiation::correct()
-{
+{}
-    return radiationModel::read();
-}
 
 
 void Foam::radiation::noRadiation::calculate()
 {}
 
 
+bool Foam::radiation::noRadiation::read()
+{
+    return radiationModel::read();
+}
+
+
 Foam::tmp<Foam::volScalarField> Foam::radiation::noRadiation::Rp() const
 {
     return tmp<volScalarField>

src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H

@@ -85,6 +85,9 @@ public:
 
         // Edit
 
+            //- Main update/correction routine
+            void correct();
+
             //- Solve radiation equation(s)
             void calculate();
 

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

@@ -74,19 +74,16 @@ Foam::IOobject Foam::radiation::radiationModel::createIOobject
 
 void Foam::radiation::radiationModel::initialise()
 {
-    if (radiation_)
+    solverFreq_ = max(1, lookupOrDefault<label>("solverFreq", 1));
-    {
-        solverFreq_ = max(1, lookupOrDefault<label>("solverFreq", 1));
 
-        absorptionEmission_.reset
+    absorptionEmission_.reset
-        (
+    (
-            absorptionEmissionModel::New(*this, mesh_).ptr()
+        absorptionEmissionModel::New(*this, mesh_).ptr()
-        );
+    );
 
-        scatter_.reset(scatterModel::New(*this, mesh_).ptr());
+    scatter_.reset(scatterModel::New(*this, mesh_).ptr());
 
-        soot_.reset(sootModel::New(*this, mesh_).ptr());
+    soot_.reset(sootModel::New(*this, mesh_).ptr());
-    }
 }
 
 
@@ -108,7 +105,6 @@ Foam::radiation::radiationModel::radiationModel(const volScalarField& T)
     mesh_(T.mesh()),
     time_(T.time()),
     T_(T),
-    radiation_(false),
     coeffs_(dictionary::null),
     solverFreq_(0),
     firstIter_(true),
@@ -128,7 +124,6 @@ Foam::radiation::radiationModel::radiationModel
     mesh_(T.mesh()),
     time_(T.time()),
     T_(T),
-    radiation_(lookupOrDefault("radiation", true)),
     coeffs_(subOrEmptyDict(type + "Coeffs")),
     solverFreq_(1),
     firstIter_(true),
@@ -136,11 +131,6 @@ Foam::radiation::radiationModel::radiationModel
     scatter_(nullptr),
     soot_(nullptr)
 {
-    if (readOpt() == IOobject::NO_READ)
-    {
-        radiation_ = false;
-    }
-
     initialise();
 }
 
@@ -167,7 +157,6 @@ Foam::radiation::radiationModel::radiationModel
     mesh_(T.mesh()),
     time_(T.time()),
     T_(T),
-    radiation_(lookupOrDefault("radiation", true)),
     coeffs_(subOrEmptyDict(type + "Coeffs")),
     solverFreq_(1),
     firstIter_(true),
@@ -187,11 +176,25 @@ Foam::radiation::radiationModel::~radiationModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::radiation::radiationModel::correct()
+{
+    if (firstIter_ || (time_.timeIndex() % solverFreq_ == 0))
+    {
+        calculate();
+        firstIter_ = false;
+    }
+
+    if (!soot_.empty())
+    {
+        soot_->correct();
+    }
+}
+
+
 bool Foam::radiation::radiationModel::read()
 {
     if (regIOobject::read())
     {
-        lookup("radiation") >> radiation_;
         coeffs_ = subOrEmptyDict(type() + "Coeffs");
 
         solverFreq_ = lookupOrDefault<label>("solverFreq", 1);
@@ -206,26 +209,6 @@ bool Foam::radiation::radiationModel::read()
 }
 
 
-void Foam::radiation::radiationModel::correct()
-{
-    if (!radiation_)
-    {
-        return;
-    }
-
-    if (firstIter_ || (time_.timeIndex() % solverFreq_ == 0))
-    {
-        calculate();
-        firstIter_ = false;
-    }
-
-    if (!soot_.empty())
-    {
-        soot_->correct();
-    }
-}
-
-
 Foam::tmp<Foam::fvScalarMatrix> Foam::radiation::radiationModel::Sh
 (
     const basicThermo& thermo,

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

@@ -86,9 +86,6 @@ protected:
         //- Reference to the temperature field
         const volScalarField& T_;
 
-        //- Radiation model on/off flag
-        Switch radiation_;
-
         //- Radiation model dictionary
         dictionary coeffs_;
 
@@ -211,12 +208,6 @@ public:
 
         // Access
 
-            //- Radiation model on/off flag
-            const Switch radiation() const
-            {
-                return radiation_;
-            }
-
             //- Source term component (for power of T^4)
             virtual tmp<volScalarField> Rp() const = 0;
 

tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/radiationProperties

@@ -16,10 +16,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
-
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/radiationProperties

@@ -14,9 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/radiationProperties

@@ -15,9 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/radiationProperties

@@ -15,9 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/radiationProperties

@@ -14,9 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties

@@ -16,9 +16,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties

@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties

@@ -15,9 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties

@@ -15,10 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
-
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties

@@ -15,9 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties

@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties

@@ -15,9 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties

@@ -15,9 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties

@@ -15,10 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-solverFreq      10;
-
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties

@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
 // ************************************************************************* //

tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties

@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
 // ************************************************************************* //

tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties

@@ -15,9 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       off;
-
 radiationModel  none;
 
-
 // ************************************************************************* //