diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 1759fee13c..eb4ec5504e 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H index f16d6e523a..32f6174c00 100644 --- a/applications/solvers/combustion/fireFoam/YEEqn.H +++ b/applications/solvers/combustion/fireFoam/YEEqn.H @@ -9,7 +9,6 @@ tmp> mvConvection ) ); { - radiation->correct(); combustion->correct(); forAll(Y, i) @@ -61,7 +60,6 @@ tmp> mvConvection + thermophysicalTransport->divq(he) == combustion->Qdot() - + radiation->Sh(thermo, he) + parcels.Sh(he) + surfaceFilm.Sh() + fvOptions(rho, he) diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index a2bf22df2f..0f0d187a35 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/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" diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index c89db6db1a..e450617acd 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/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" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H index 0514425f68..8f5d8938c6 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H +++ b/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(); } diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options index e700dfad60..3d13487350 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index 7089ff4ac8..852006b1f8 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/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" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H index 90c67c1666..60f9500fdd 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H +++ b/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" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H index 20dec3dff0..1d6a57fef0 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H +++ b/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(); } diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options index 7d47cb682e..7543913e83 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options +++ b/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 diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index 8882ce6250..b1cf259276 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/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" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H index 6d0a3e3e01..9ac2bb8b82 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H +++ b/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" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index aff9693554..17f6f41544 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/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 diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index 12fa595767..05aa6b5155 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/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" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H index 4bf387197b..70fb224de0 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H +++ b/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; diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index a8d7d62aeb..27d6394a3b 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -14,7 +14,6 @@ PtrList thermophysicalTransportFluid(fluidRegions.size()); PtrList reactionFluid(fluidRegions.size()); PtrList p_rghFluid(fluidRegions.size()); -PtrList radiationFluid(fluidRegions.size()); PtrList KFluid(fluidRegions.size()); PtrList dpdtFluid(fluidRegions.size()); PtrList::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; diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H index 576cf4c703..a4b4379fd2 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H @@ -32,11 +32,11 @@ multivariateSurfaceInterpolationScheme::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", diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H index 3b29d500ad..12f21ff55e 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H @@ -1,6 +1,5 @@ // Initialise solid field pointer lists PtrList thermoSolid(solidRegions.size()); -PtrList radiationSolid(solidRegions.size()); PtrList 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 ( diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H index d62599801a..63bd4d5fd3 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H @@ -1,3 +1,5 @@ +const fvMesh& mesh = solidRegions[i]; + solidThermo& thermo = thermoSolid[i]; tmp 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); diff --git a/applications/solvers/heatTransfer/thermoFoam/EEqn.H b/applications/solvers/heatTransfer/thermoFoam/EEqn.H index 88028f7782..7408a2833a 100644 --- a/applications/solvers/heatTransfer/thermoFoam/EEqn.H +++ b/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(); } diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options index b5680954d6..c9a2ed0c71 100644 --- a/applications/solvers/heatTransfer/thermoFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/heatTransfer/thermoFoam/createFields.H b/applications/solvers/heatTransfer/thermoFoam/createFields.H index 871816e405..ab42850e76 100644 --- a/applications/solvers/heatTransfer/thermoFoam/createFields.H +++ b/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" diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C index 538c5eacc0..f4ad4ab1ed 100644 --- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C +++ b/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" diff --git a/applications/solvers/lagrangian/denseParticleFoam/Make/options b/applications/solvers/lagrangian/denseParticleFoam/Make/options index a258cd1f13..09e526ffc3 100644 --- a/applications/solvers/lagrangian/denseParticleFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/lagrangian/reactingParticleFoam/EEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/EEqn.H index cea1449662..99ad8798fc 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/EEqn.H +++ b/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; diff --git a/applications/solvers/lagrangian/reactingParticleFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/Make/options index ae04f39126..032b743001 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options index 2f2103dc9f..2ca2383535 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C index e87119dc5f..3334e5a8b1 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C +++ b/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" diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H index 1d0eb42198..8659a667c6 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H +++ b/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" diff --git a/applications/solvers/lagrangian/reactingParticleFoam/createFields.H b/applications/solvers/lagrangian/reactingParticleFoam/createFields.H index bac0c74b95..9cc1f8a273 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/createFields.H +++ b/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" diff --git a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options index c52e113cc2..f42e842985 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C index dc217b63a7..34154a8468 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C +++ b/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" diff --git a/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C index f2c8d18fda..75b40303ee 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C +++ b/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" diff --git a/applications/solvers/lagrangian/rhoParticleFoam/Make/options b/applications/solvers/lagrangian/rhoParticleFoam/Make/options index 46144ebabf..cf646ee4be 100644 --- a/applications/solvers/lagrangian/rhoParticleFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/EEqn.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/EEqn.H index 31d4828a45..371c6d473c 100644 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/EEqn.H +++ b/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; diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options b/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options index 0828e7086c..6d50329a17 100644 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/createFields.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/createFields.H index 077a355cf1..f9a9acf781 100644 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/createFields.H +++ b/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" diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C b/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C index ed8ee388da..da6601ee6d 100644 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C +++ b/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" diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H index 97aad15ef5..f336a12252 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H @@ -138,7 +138,7 @@ public: // Edit - //- Read radiationProperties dictionary + //- Read SRFProperties dictionary virtual bool read(); diff --git a/src/finiteVolume/cfdTools/general/include/checkRadiationModel.H b/src/finiteVolume/cfdTools/general/include/checkRadiationModel.H new file mode 100644 index 0000000000..10ed2a665b --- /dev/null +++ b/src/finiteVolume/cfdTools/general/include/checkRadiationModel.H @@ -0,0 +1,35 @@ +if (!mesh.foundObject("radiationProperties")) +{ + IOobject radiationProperties + ( + "radiationProperties", + runTime.constant(), + mesh, + IOobject::MUST_READ, + IOobject::NO_WRITE, + false + ); + + if (radiationProperties.typeHeaderOk(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); + } + } +} diff --git a/src/radiationModels/radiationModels/radiationModel/radiationModelNew.C b/src/radiationModels/radiationModels/radiationModel/radiationModelNew.C index ed9135dfe6..f9afa2cf95 100644 --- a/src/radiationModels/radiationModels/radiationModel/radiationModelNew.C +++ b/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::New const volScalarField& T ) { - IOobject radIO + const IOdictionary radiationProperties ( - "radiationProperties", - T.time().constant(), - T.mesh(), - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false + IOobject + ( + "radiationProperties", + T.time().constant(), + T.mesh(), + IOobject::MUST_READ, + IOobject::NO_WRITE, + false + ) ); - word modelType("none"); - if (radIO.typeHeaderOk(false)) - { - IOdictionary(radIO).lookup("radiationModel") >> modelType; - } - else - { - Info<< "Radiation model not active: radiationProperties not found" - << endl; - } + const word modelType(radiationProperties.lookup("radiationModel")); Info<< "Selecting radiationModel " << modelType << endl; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/radiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/fvOptions similarity index 86% rename from tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/radiationProperties rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/fvOptions index 1295b15e1b..95216e67c9 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/radiationProperties +++ b/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"); +} // ************************************************************************* // diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/fvOptions similarity index 86% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/radiationProperties rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/fvOptions index 3c09394e9d..95216e67c9 100644 --- a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/radiationProperties +++ b/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"); +} // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/fvOptions b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/fvOptions index a483385480..95216e67c9 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/fvOptions +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/fvOptions @@ -17,8 +17,8 @@ FoamFile radiation { - type radiation; - libs ("libradiationModels.so"); + type radiation; + libs ("libradiationModels.so"); } // ************************************************************************* // diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/fvOptions similarity index 86% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/radiationProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/fvOptions index 3c09394e9d..95216e67c9 100644 --- a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/radiationProperties +++ b/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"); +} // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties index 4c98c899ce..1c57521317 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties @@ -15,8 +15,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -radiation on; - radiationModel P1; // Number of flow iterations per radiation iteration diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/fvOptions similarity index 86% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/radiationProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/fvOptions index 3c09394e9d..95216e67c9 100644 --- a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/radiationProperties +++ b/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"); +} // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties index 2602c18cdc..b73b6f9d47 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties @@ -15,8 +15,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -radiation on; - radiationModel fvDOM; fvDOMCoeffs diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions index 6c73634312..95216e67c9 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions @@ -15,28 +15,10 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -options +radiation { - energySource - { - type semiImplicitSource; - - timeStart 0; - duration 1; - selectionMode cellSet; - cellSet ignition; - volumeMode specific; - - sources - { - h - { - explicit 5e7; // kg/m/s^3 - implicit 0; - } - } - } + type radiation; + libs ("libradiationModels.so"); } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/radiationProperties index b4aab2a1a9..afe8c17007 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/radiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/radiationProperties @@ -15,8 +15,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -radiation on; - radiationModel P1; solverFreq 1; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/fvOptions b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/fvOptions new file mode 100644 index 0000000000..95216e67c9 --- /dev/null +++ b/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"); +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/radiationProperties index 047aebe4ab..0d413664f8 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/radiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/radiationProperties @@ -15,8 +15,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -radiation on; - radiationModel opaqueSolid; absorptionEmissionModel constant; diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/radiationProperties b/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/radiationProperties deleted file mode 100644 index 3c09394e9d..0000000000 --- a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/radiationProperties +++ /dev/null @@ -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; - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/radiationProperties b/tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/radiationProperties deleted file mode 100644 index 3c09394e9d..0000000000 --- a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/radiationProperties +++ /dev/null @@ -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; - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/radiationProperties b/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/radiationProperties deleted file mode 100644 index 3c09394e9d..0000000000 --- a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/radiationProperties +++ /dev/null @@ -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; - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/radiationProperties b/tutorials/lagrangian/reactingParticleFoam/filter/constant/radiationProperties deleted file mode 100644 index 3c09394e9d..0000000000 --- a/tutorials/lagrangian/reactingParticleFoam/filter/constant/radiationProperties +++ /dev/null @@ -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; - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/radiationProperties b/tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/radiationProperties deleted file mode 100644 index 3c09394e9d..0000000000 --- a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/radiationProperties +++ /dev/null @@ -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; - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/fvOptions b/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/fvOptions index dd7e63fab7..09ede33087 100644 --- a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/fvOptions +++ b/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/fvOptions @@ -28,5 +28,11 @@ source1 temperature 2000; } +radiation +{ + type radiation; + libs ("libradiationModels.so"); +} + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/radiationProperties deleted file mode 100644 index 3c09394e9d..0000000000 --- a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/radiationProperties +++ /dev/null @@ -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; - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/radiationProperties b/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/radiationProperties deleted file mode 100644 index 3c09394e9d..0000000000 --- a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/radiationProperties +++ /dev/null @@ -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; - -// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/radiationProperties deleted file mode 100644 index 3c09394e9d..0000000000 --- a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/radiationProperties +++ /dev/null @@ -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; - -// ************************************************************************* //