radiation: Changes thermal solvers to select radiation via fvOptions

This simplifies and standardises the handling of radiation in all solvers which
include an energy equation, all of which now support radiation via the
'radiation' fvOption which is selected in the constant/fvOption or
constant/<region>/fvOption file:

radiation
{
    type    radiation;
    libs    ("libradiationModels.so");
}

The radiation model, parameters, settings and sub-models are specified in the
'radiationProperties' file as before.

applications/solvers/combustion/fireFoam/Make/options

@@ -14,7 +14,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -37,7 +36,6 @@ EXE_LIBS = \
     -lchemistryModel \
     -lcombustionModels \
     -lregionModels \
-    -lradiationModels \
     -lsurfaceFilmModels \
     -lsurfaceFilmDerivedFvPatchFields \
     -llagrangianParcel \

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -9,7 +9,6 @@ tmp<fv::convectionScheme<scalar>> mvConvection
     )
 );
 {
-    radiation->correct();
     combustion->correct();
 
     forAll(Y, i)
@@ -61,7 +60,6 @@ tmp<fv::convectionScheme<scalar>> mvConvection
       + thermophysicalTransport->divq(he)
      ==
         combustion->Qdot()
-      + radiation->Sh(thermo, he)
       + parcels.Sh(he)
       + surfaceFilm.Sh()
       + fvOptions(rho, he)

applications/solvers/combustion/fireFoam/createFields.H

@@ -134,5 +134,5 @@ volScalarField K("K", 0.5*magSqr(U));
 
 #include "createClouds.H"
 #include "createSurfaceFilmModel.H"
-#include "createRadiationModel.H"
 #include "createFvOptions.H"
+#include "checkRadiationModel.H"

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -35,7 +35,6 @@ Description
 #include "fluidReactionThermophysicalTransportModel.H"
 #include "parcelCloudList.H"
 #include "surfaceFilmModel.H"
-#include "radiationModel.H"
 #include "SLGThermo.H"
 #include "fluidReactionThermo.H"
 #include "combustionModel.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H

@@ -18,7 +18,6 @@
       + thermophysicalTransport->divq(he)
      ==
         rho*(U&g)
-      + radiation->Sh(thermo, he)
       + fvOptions(rho, he)
     );
 
@@ -31,5 +30,4 @@
     fvOptions.correct(he);
 
     thermo.correct();
-    radiation->correct();
 }

applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options

@@ -2,7 +2,6 @@ EXE_INC = \
     -I. \
     -I../../compressible/rhoPimpleFoam \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
@@ -14,7 +13,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfluidThermophysicalModels \
-    -lradiationModels \
     -lspecie \
     -lmomentumTransportModels \
     -lfluidThermoMomentumTransportModels \

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -39,7 +39,6 @@ Description
 #include "fluidThermo.H"
 #include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermophysicalTransportModel.H"
-#include "radiationModel.H"
 #include "pimpleControl.H"
 #include "pressureControl.H"
 #include "CorrectPhi.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H

@@ -109,5 +109,5 @@ volScalarField K("K", 0.5*magSqr(U));
 dimensionedScalar initialMass = fvc::domainIntegrate(rho);
 
 #include "createMRF.H"
-#include "createRadiationModel.H"
 #include "createFvOptions.H"
+#include "checkRadiationModel.H"

applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H

@@ -12,7 +12,6 @@
       + thermophysicalTransport->divq(he)
      ==
         rho*(U&g)
-      + radiation->Sh(thermo, he)
       + fvOptions(rho, he)
     );
 
@@ -25,5 +24,4 @@
     fvOptions.correct(he);
 
     thermo.correct();
-    radiation->correct();
 }

applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options

@@ -4,7 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude
@@ -17,7 +16,6 @@ EXE_LIBS = \
     -lthermophysicalTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lradiationModels \
     -lmomentumTransportModels \
     -lfluidThermoMomentumTransportModels \
     -lmeshTools

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -33,7 +33,6 @@ Description
 #include "fvCFD.H"
 #include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermophysicalTransportModel.H"
-#include "radiationModel.H"
 #include "simpleControl.H"
 #include "pressureControl.H"
 #include "fvOptions.H"

applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H

@@ -91,5 +91,5 @@ mesh.setFluxRequired(p_rgh.name());
 dimensionedScalar initialMass = fvc::domainIntegrate(rho);
 
 #include "createMRF.H"
-#include "createRadiationModel.H"
 #include "createFvOptions.H"
+#include "checkRadiationModel.H"

applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options

@@ -20,7 +20,6 @@ EXE_INC = \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
 
@@ -38,7 +37,6 @@ EXE_LIBS = \
     -lfluidReactionThermophysicalTransportModels \
     -lmeshTools \
     -lfiniteVolume \
-    -lradiationModels \
     -lfvOptions \
     -lregionModels \
     -lsampling

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C

@@ -41,7 +41,6 @@ Description
 #include "compressibleCourantNo.H"
 #include "solidRegionDiffNo.H"
 #include "solidThermo.H"
-#include "radiationModel.H"
 #include "fvOptions.H"
 #include "coordinateSystem.H"
 #include "pimpleMultiRegionControl.H"

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

@@ -23,7 +23,6 @@
       + thermophysicalTransport.divq(he)
      ==
         rho*(U&g)
-      + radiation.Sh(thermo, he)
       + reaction.Qdot()
       + fvOptions(rho, he)
     );
@@ -37,7 +36,6 @@
     fvOptions.correct(he);
 
     thermo.correct();
-    radiation.correct();
 
     Info<< "Min/max T:" << min(thermo.T()).value() << ' '
         << max(thermo.T()).value() << endl;

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

@@ -14,7 +14,6 @@ PtrList<fluidReactionThermophysicalTransportModel>
     thermophysicalTransportFluid(fluidRegions.size());
 PtrList<combustionModel> reactionFluid(fluidRegions.size());
 PtrList<volScalarField> p_rghFluid(fluidRegions.size());
-PtrList<radiationModel> radiationFluid(fluidRegions.size());
 PtrList<volScalarField> KFluid(fluidRegions.size());
 PtrList<volScalarField> dpdtFluid(fluidRegions.size());
 PtrList<multivariateSurfaceInterpolationScheme<scalar>::fieldTable>
@@ -219,13 +218,6 @@ forAll(fluidRegions, i)
 
     fluidRegions[i].setFluxRequired(p_rghFluid[i].name());
 
-    Info<< "    Adding to radiationFluid\n" << endl;
-    radiationFluid.set
-    (
-        i,
-        radiationModel::New(thermoFluid[i].T())
-    );
-
     initialMassFluid[i] = fvc::domainIntegrate(rhoFluid[i]).value();
 
     Info<< "    Adding to KFluid\n" << endl;

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

@@ -32,11 +32,11 @@
     multivariateSurfaceInterpolationScheme<scalar>::fieldTable& fields =
         fieldsFluid[i];
 
-    radiationModel& radiation = radiationFluid[i];
-
     IOMRFZoneList& MRF = MRFfluid[i];
     const fv::options& fvOptions = fvOptionsFluid[i];
 
+    #include "checkRadiationModel.H"
+
     const dimensionedScalar initialMass
     (
         "initialMass",

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H

@@ -1,6 +1,5 @@
 // Initialise solid field pointer lists
 PtrList<solidThermo> thermoSolid(solidRegions.size());
-PtrList<radiationModel> radiationSolid(solidRegions.size());
 PtrList<fv::options> fvOptionsSolid(solidRegions.size());
 
 // Populate solid field pointer lists
@@ -12,9 +11,6 @@ forAll(solidRegions, i)
     Info<< "    Adding to thermoSolid\n" << endl;
     thermoSolid.set(i, solidThermo::New(solidRegions[i]));
 
-    Info<< "    Adding to radiationSolid\n" << endl;
-    radiationSolid.set(i, radiationModel::New(thermoSolid[i].T()));
-
     Info<< "    Adding to fvOptionsSolid\n" << endl;
     fvOptionsSolid.set
     (

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H

@@ -1,3 +1,5 @@
+const fvMesh& mesh = solidRegions[i];
+
 solidThermo& thermo = thermoSolid[i];
 
 tmp<volScalarField> trho = thermo.rho();
@@ -7,4 +9,6 @@ volScalarField& e = thermo.he();
 
 const fv::options& fvOptions = fvOptionsSolid[i];
 
+#include "checkRadiationModel.H"
+
 solidNoLoopControl& pimple = pimples.solid(i);

applications/solvers/heatTransfer/thermoFoam/EEqn.H

@@ -17,8 +17,7 @@
         )
       + thermophysicalTransport->divq(he)
      ==
-        radiation->Sh(thermo, he)
+        fvOptions(rho, he)
-      + fvOptions(rho, he)
     );
 
     EEqn.relax();
@@ -30,5 +29,4 @@
     fvOptions.correct(he);
 
     thermo.correct();
-    radiation->correct();
 }

applications/solvers/heatTransfer/thermoFoam/Make/options

@@ -3,7 +3,6 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude
@@ -14,7 +13,6 @@ EXE_LIBS = \
     -lmeshTools \
     -lfvOptions \
     -lfluidThermophysicalModels \
-    -lradiationModels \
     -lspecie \
     -lmomentumTransportModels \
     -lfluidThermoMomentumTransportModels \

applications/solvers/heatTransfer/thermoFoam/createFields.H

@@ -69,5 +69,5 @@ volScalarField dpdt
 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K("K", 0.5*magSqr(U));
 
-#include "createRadiationModel.H"
 #include "createFvOptions.H"
+#include "checkRadiationModel.H"

applications/solvers/heatTransfer/thermoFoam/thermoFoam.C

@@ -34,7 +34,6 @@ Description
 #include "fluidThermoMomentumTransportModel.H"
 #include "fluidThermophysicalTransportModel.H"
 #include "LESModel.H"
-#include "radiationModel.H"
 #include "fvOptions.H"
 #include "simpleControl.H"
 #include "pimpleControl.H"

applications/solvers/lagrangian/denseParticleFoam/Make/options

@@ -5,7 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/transportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \

applications/solvers/lagrangian/reactingParticleFoam/EEqn.H

@@ -25,7 +25,6 @@
         rho*(U&g)
       + clouds.Sh(he)
       + surfaceFilm.Sh()
-      + radiation->Sh(thermo, he)
       + combustion->Qdot()
       + fvOptions(rho, he)
     );
@@ -39,7 +38,6 @@
     fvOptions.correct(he);
 
     thermo.correct();
-    radiation->correct();
 
     Info<< "T gas min/max   = " << min(T).value() << ", "
         << max(T).value() << endl;

applications/solvers/lagrangian/reactingParticleFoam/Make/options

@@ -15,7 +15,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -39,7 +38,6 @@ EXE_LIBS = \
     -lSLGThermo \
     -lchemistryModel \
     -lregionModels \
-    -lradiationModels \
     -lsurfaceFilmModels \
     -lsurfaceFilmDerivedFvPatchFields \
     -llagrangian \

applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options

@@ -16,7 +16,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -40,7 +39,6 @@ EXE_LIBS = \
     -lSLGThermo \
     -lchemistryModel \
     -lregionModels \
-    -lradiationModels \
     -lsurfaceFilmModels \
     -lsurfaceFilmDerivedFvPatchFields \
     -llagrangian \

applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C

@@ -37,7 +37,6 @@ Description
 #include "parcelCloudList.H"
 #include "surfaceFilmModel.H"
 #include "combustionModel.H"
-#include "radiationModel.H"
 #include "SLGThermo.H"
 #include "fvOptions.H"
 #include "pimpleControl.H"

applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H

@@ -125,7 +125,7 @@ forAll(Y, i)
 fields.add(thermo.he());
 
 #include "createMRF.H"
-#include "createRadiationModel.H"
 #include "createClouds.H"
 #include "createSurfaceFilmModel.H"
 #include "createFvOptions.H"
+#include "checkRadiationModel.H"

applications/solvers/lagrangian/reactingParticleFoam/createFields.H

@@ -106,7 +106,7 @@ forAll(Y, i)
 fields.add(thermo.he());
 
 #include "createMRF.H"
-#include "createRadiationModel.H"
 #include "createClouds.H"
 #include "createSurfaceFilmModel.H"
 #include "createFvOptions.H"
+#include "checkRadiationModel.H"

applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options

@@ -16,7 +16,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -41,7 +40,6 @@ EXE_LIBS = \
     -lSLGThermo \
     -lchemistryModel \
     -lregionModels \
-    -lradiationModels \
     -lsurfaceFilmModels \
     -lsurfaceFilmDerivedFvPatchFields \
     -llagrangian \

applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C

@@ -37,7 +37,6 @@ Description
 #include "parcelCloudList.H"
 #include "surfaceFilmModel.H"
 #include "combustionModel.H"
-#include "radiationModel.H"
 #include "SLGThermo.H"
 #include "fvOptions.H"
 #include "pimpleControl.H"

applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C

@@ -37,7 +37,6 @@ Description
 #include "parcelCloudList.H"
 #include "surfaceFilmModel.H"
 #include "combustionModel.H"
-#include "radiationModel.H"
 #include "SLGThermo.H"
 #include "fvOptions.H"
 #include "pimpleControl.H"

applications/solvers/lagrangian/rhoParticleFoam/Make/options

@@ -4,7 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -19,7 +18,6 @@ EXE_LIBS = \
     -llagrangianParcelTurbulence \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lradiationModels \
     -lmomentumTransportModels \
     -lfluidThermoMomentumTransportModels \
     -lfiniteVolume \

applications/solvers/lagrangian/simpleReactingParticleFoam/EEqn.H

@@ -13,7 +13,6 @@
      ==
         rho*(U&g)
       + clouds.Sh(he)
-      + radiation->Sh(thermo, he)
       + combustion->Qdot()
       + fvOptions(rho, he)
     );
@@ -26,7 +25,6 @@
 
     fvOptions.correct(he);
     thermo.correct();
-    radiation->correct();
 
     Info<< "T gas min/max   = " << min(T).value() << ", "
         << max(T).value() << endl;

applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options

@@ -15,7 +15,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-    -I$(LIB_SRC)/radiationModels/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
@@ -39,7 +38,6 @@ EXE_LIBS = \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lchemistryModel \
-    -lradiationModels \
     -lODE \
     -lregionModels \
     -lsurfaceFilmModels \

applications/solvers/lagrangian/simpleReactingParticleFoam/createFields.H

@@ -102,6 +102,6 @@ forAll(Y, i)
 fields.add(thermo.he());
 
 #include "createMRF.H"
-#include "createRadiationModel.H"
 #include "createClouds.H"
 #include "createFvOptions.H"
+#include "checkRadiationModel.H"

applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C

@@ -36,7 +36,6 @@ Description
 #include "parcelCloudList.H"
 #include "fluidReactionThermo.H"
 #include "combustionModel.H"
-#include "radiationModel.H"
 #include "IOporosityModelList.H"
 #include "fvOptions.H"
 #include "SLGThermo.H"

src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H

@@ -138,7 +138,7 @@ public:
 
         // Edit
 
-            //- Read radiationProperties dictionary
+            //- Read SRFProperties dictionary
             virtual bool read();
 
 

src/finiteVolume/cfdTools/general/include/checkRadiationModel.H

@@ -0,0 +1,35 @@
+if (!mesh.foundObject<IOdictionary>("radiationProperties"))
+{
+    IOobject radiationProperties
+    (
+        "radiationProperties",
+        runTime.constant(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (radiationProperties.typeHeaderOk<IOdictionary>(false))
+    {
+        const word modelType
+        (
+            IOdictionary(radiationProperties).lookup("radiationModel")
+        );
+
+        if (modelType != "none")
+        {
+            FatalErrorInFunction
+                << "Radiation model " << modelType
+                << " selected but not enabled in fvOptions" << nl
+                << "To enable radiation add " << nl << nl
+                << "radiation" << nl
+                << "{" << nl
+                << "    type    radiation;" << nl
+                << "    libs    (\"libradiationModels.so\");" << nl
+                << "}" << nl << nl
+                << "to " << radiationProperties.localPath()/"fvOptions"
+                << exit(FatalError);
+        }
+    }
+}

src/radiationModels/radiationModels/radiationModel/radiationModelNew.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,26 +33,20 @@ Foam::autoPtr<Foam::radiationModel> Foam::radiationModel::New
     const volScalarField& T
 )
 {
-    IOobject radIO
+    const IOdictionary radiationProperties
     (
-        "radiationProperties",
+        IOobject
-        T.time().constant(),
+        (
-        T.mesh(),
+            "radiationProperties",
-        IOobject::MUST_READ_IF_MODIFIED,
+            T.time().constant(),
-        IOobject::NO_WRITE,
+            T.mesh(),
-        false
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        )
     );
 
-    word modelType("none");
+    const word modelType(radiationProperties.lookup("radiationModel"));
-    if (radIO.typeHeaderOk<IOdictionary>(false))
-    {
-        IOdictionary(radIO).lookup("radiationModel") >> modelType;
-    }
-    else
-    {
-        Info<< "Radiation model not active: radiationProperties not found"
-            << endl;
-    }
 
     Info<< "Selecting radiationModel " << modelType << endl;
 

tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/fvOptions

@@ -5,17 +5,20 @@
     \\  /    A nd           | Version:  dev
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
     version     2.0;
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      radiationProperties;
+    object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiationModel  none;
+radiation
+{
+    type    radiation;
+    libs    ("libradiationModels.so");
+}
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/fvOptions

@@ -11,10 +11,14 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      radiationProperties;
+    object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiationModel  none;
+radiation
+{
+    type    radiation;
+    libs    ("libradiationModels.so");
+}
 
 // ************************************************************************* //

tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/fvOptions

@@ -17,8 +17,8 @@ FoamFile
 
 radiation
 {
-    type            radiation;
+    type    radiation;
-    libs ("libradiationModels.so");
+    libs    ("libradiationModels.so");
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/fvOptions

@@ -11,10 +11,14 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      radiationProperties;
+    object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiationModel  none;
+radiation
+{
+    type    radiation;
+    libs    ("libradiationModels.so");
+}
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties

@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation on;
-
 radiationModel  P1;
 
 // Number of flow iterations per radiation iteration

tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/fvOptions

@@ -11,10 +11,14 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      radiationProperties;
+    object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiationModel  none;
+radiation
+{
+    type    radiation;
+    libs    ("libradiationModels.so");
+}
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties

@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation on;
-
 radiationModel  fvDOM;
 
 fvDOMCoeffs

tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions

@@ -15,28 +15,10 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-options
+radiation
 {
-    energySource
+    type    radiation;
-    {
+    libs    ("libradiationModels.so");
-        type            semiImplicitSource;
-
-        timeStart       0;
-        duration        1;
-        selectionMode   cellSet;
-        cellSet         ignition;
-        volumeMode      specific;
-
-        sources
-        {
-            h
-            {
-                explicit    5e7; // kg/m/s^3
-                implicit    0;
-            }
-        }
-    }
 }
 
-
 // ************************************************************************* //

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

@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       on;
-
 radiationModel  P1;
 
 solverFreq      1;

tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/fvOptions

@@ -0,0 +1,24 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      fvOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation
+{
+    type    radiation;
+    libs    ("libradiationModels.so");
+}
+
+// ************************************************************************* //

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

@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radiation       on;
-
 radiationModel  opaqueSolid;
 
 absorptionEmissionModel constant;

tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/radiationProperties

@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      radiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-radiationModel  none;
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/radiationProperties

@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      radiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-radiationModel  none;
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/radiationProperties

@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      radiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-radiationModel  none;
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParticleFoam/filter/constant/radiationProperties

@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      radiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-radiationModel  none;
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/radiationProperties

@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      radiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-radiationModel  none;
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/fvOptions

@@ -28,5 +28,11 @@ source1
     temperature     2000;
 }
 
+radiation
+{
+    type    radiation;
+    libs    ("libradiationModels.so");
+}
+
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/radiationProperties

@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      radiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-radiationModel  none;
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/radiationProperties

@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      radiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-radiationModel  none;
-
-// ************************************************************************* //

tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/radiationProperties

@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      radiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-radiationModel  none;
-
-// ************************************************************************* //