From c59c82ac0eb8dc79e5784dff1dd289d189d8f8e2 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 7 Feb 2019 14:48:20 +0000 Subject: [PATCH] radiationModels: Relocation, namespace changes, and fixed Qdot access The radiation modelling library has been moved out of thermophysicalProperties into the top-level source directory. Radiation is a process, not a property, and belongs alongside turbulence, combustion, etc... The namespaces used within the radiation library have been made consistent with the rest of the code. Selectable sub-models are in namespaces named after their base classes. Some models have been renamed remove the base type from the suffix, as this is unnecessary. These renames are: Old name: New name: binaryAbsorptionEmission binary cloudAbsorptionEmission cloud constantAbsorptionEmission constant greyMeanAbsorptionEmission greyMean/greyMeanCombustion greyMeanSolidAbsorptionEmission greyMeanSolid wideBandAbsorptionEmission wideBand/wideBandCombustion cloudScatter cloud constantScatter constant mixtureFractionSoot mixtureFraction Some absorption-emission models have been split into versions which do and don't use the heat release rate. The version that does has been given the post-fix "Combustion" and has been moved into the combustionModels library. This removes the dependence on a registered Qdot field, and makes the models compatible with the recent removal of that field from the combustion solvers. --- .../solvers/combustion/fireFoam/Make/options | 2 +- .../buoyantBoussinesqPimpleFoam/Make/options | 2 +- .../buoyantBoussinesqSimpleFoam/Make/options | 2 +- .../buoyantPimpleFoam/Make/options | 2 +- .../buoyantSimpleFoam/Make/options | 2 +- .../chtMultiRegionFoam/Make/options | 2 +- .../fluid/createFluidFields.H | 4 +- .../fluid/setRegionFluidFields.H | 2 +- .../solid/createSolidFields.H | 4 +- .../heatTransfer/thermoFoam/Make/options | 2 +- .../lagrangian/DPMFoam/MPPICFoam/Make/options | 2 +- .../solvers/lagrangian/DPMFoam/Make/options | 2 +- .../lagrangian/coalChemistryFoam/Make/options | 2 +- .../reactingParcelFoam/Make/options | 2 +- .../simpleReactingParcelFoam/Make/options | 2 +- .../solvers/lagrangian/sprayFoam/Make/options | 2 +- .../sprayFoam/engineFoam/Make/options | 2 +- .../uncoupledKinematicParcelFoam/Make/options | 2 +- applications/test/Function1/Make/options | 2 +- src/Allwmake | 1 + src/combustionModels/Make/files | 3 + src/combustionModels/Make/options | 2 + .../greyMeanCombustion/greyMeanCombustion.C | 89 ++++++++++++ .../greyMeanCombustion/greyMeanCombustion.H | 103 +++++++++++++ .../wideBandCombustion/wideBandCombustion.C | 102 +++++++++++++ .../wideBandCombustion/wideBandCombustion.H | 101 +++++++++++++ src/lagrangian/coalCombustion/Make/options | 2 +- src/lagrangian/intermediate/Make/options | 2 +- .../cloudAbsorptionEmission.C | 41 +++--- .../cloudAbsorptionEmission.H | 45 +++--- .../scatter/cloudScatter/cloudScatter.C | 31 ++-- .../scatter/cloudScatter/cloudScatter.H | 33 ++--- src/lagrangian/spray/Make/options | 2 +- .../radiation => radiationModels}/Make/files | 34 ++--- .../Make/options | 0 .../absorptionEmissionModel.C | 34 ++--- .../absorptionEmissionModel.H | 8 +- .../absorptionEmissionModelNew.C | 6 +- .../absorptionEmissionModels/binary/binary.C} | 61 +++++--- .../absorptionEmissionModels/binary/binary.H} | 27 ++-- .../constantAbsorptionEmission.C | 42 ++++-- .../constantAbsorptionEmission.H | 21 +-- .../greyMean/greyMean.C} | 99 +++++-------- .../greyMean/greyMean.H} | 77 +++++----- .../greyMeanSolid/greyMeanSolid.C} | 52 ++++--- .../greyMeanSolid/greyMeanSolid.H} | 30 ++-- .../noAbsorptionEmission.C | 31 ++-- .../noAbsorptionEmission.H | 11 +- .../wideBand/wideBand.C} | 111 ++++++-------- .../wideBand/wideBand.H} | 135 +++++++++--------- .../MarshakRadiationFvPatchScalarField.C | 28 ++-- .../MarshakRadiationFvPatchScalarField.H | 5 +- ...iationFixedTemperatureFvPatchScalarField.C | 25 ++-- ...iationFixedTemperatureFvPatchScalarField.H | 5 +- ...iffusiveRadiationMixedFvPatchScalarField.C | 31 ++-- ...iffusiveRadiationMixedFvPatchScalarField.H | 11 +- ...veViewFactorFixedValueFvPatchScalarField.C | 26 ++-- ...veViewFactorFixedValueFvPatchScalarField.H | 11 +- .../radiationCoupledBase.C | 32 ++--- .../radiationCoupledBase.H | 5 +- ...iffusiveRadiationMixedFvPatchScalarField.C | 38 +++-- ...iffusiveRadiationMixedFvPatchScalarField.H | 7 +- .../fvOptions/radiation/radiation.C | 4 +- .../fvOptions/radiation/radiation.H | 4 +- .../createIncompressibleRadiationModel.H | 7 +- .../include/createRadiationModel.H | 1 + .../radiationModels/P1/P1.C | 26 ++-- .../radiationModels/P1/P1.H | 8 +- .../fvDOM/absorptionCoeffs/absorptionCoeffs.C | 12 +- .../fvDOM/absorptionCoeffs/absorptionCoeffs.H | 11 +- .../absorptionCoeffs/absorptionCoeffsI.H | 18 +-- .../blackBodyEmission/blackBodyEmission.C | 16 +-- .../blackBodyEmission/blackBodyEmission.H | 8 +- .../radiationModels}/fvDOM/fvDOM.C | 34 ++--- .../radiationModels}/fvDOM/fvDOM.H | 8 +- .../radiationModels}/fvDOM/fvDOMI.H | 34 ++--- .../radiativeIntensityRay.C | 12 +- .../radiativeIntensityRay.H | 8 +- .../radiativeIntensityRayI.H | 33 +++-- .../radiationModels/noRadiation/noRadiation.C | 28 ++-- .../radiationModels/noRadiation/noRadiation.H | 8 +- .../radiationModels/opaqueSolid/opaqueSolid.C | 26 ++-- .../radiationModels/opaqueSolid/opaqueSolid.H | 8 +- .../radiationModel/radiationModel.C | 55 +++---- .../radiationModel/radiationModel.H | 29 ++-- .../radiationModel/radiationModelNew.C | 8 +- .../radiationModels/viewFactor/viewFactor.C | 38 ++--- .../radiationModels/viewFactor/viewFactor.H | 8 +- .../radiationModels/viewFactor/viewFactorI.H | 4 +- .../constantScatter/constantScatter.C | 29 ++-- .../constantScatter/constantScatter.H | 22 +-- .../scatterModels}/noScatter/noScatter.C | 22 +-- .../scatterModels}/noScatter/noScatter.H | 11 +- .../scatterModel/scatterModel.C | 16 +-- .../scatterModel/scatterModel.H | 8 +- .../scatterModel/scatterModelNew.C | 5 +- .../mixtureFraction/mixtureFraction.C} | 16 ++- .../mixtureFraction/mixtureFraction.H} | 34 ++--- .../mixtureFraction/mixtureFractions.C} | 12 +- .../sootModels}/noSoot/noSoot.C | 39 +++-- .../sootModels}/noSoot/noSoot.H | 19 ++- .../sootModels}/sootModel/makeSootTypes.H | 36 +++-- .../sootModels}/sootModel/sootModel.C | 11 +- .../sootModels}/sootModel/sootModel.H | 32 ++--- .../sootModels}/sootModel/sootModelNew.C | 6 +- src/regionModels/pyrolysisModels/Make/options | 2 +- .../pyrolysisModels/noPyrolysis/noPyrolysis.C | 4 +- .../pyrolysisModels/noPyrolysis/noPyrolysis.H | 4 +- .../reactingOneDim/reactingOneDim.C | 6 +- .../reactingOneDim/reactingOneDim.H | 4 +- src/regionModels/regionCoupling/Make/options | 2 +- .../thermalBaffleModels/Make/options | 2 +- .../thermalBaffle/thermalBaffle.C | 6 +- .../thermalBaffle/thermalBaffle.H | 4 +- src/thermophysicalModels/Allwmake | 3 - .../radiation/include/createRadiationModel.H | 4 - .../pyrolysisRegion/radiationProperties | 4 +- .../constant/radiationProperties | 10 +- .../constant/panelRegion/radiationProperties | 4 +- .../constant/radiationProperties | 6 +- .../constant/radiationProperties | 11 +- .../constant/radiationProperties | 6 +- .../SandiaD_LTS/constant/radiationProperties | 4 +- .../constant/radiationProperties | 4 +- .../constant/radiationProperties | 4 +- .../constant/gas/radiationProperties | 4 +- .../constant/solid/radiationProperties | 4 +- .../constant/radiationProperties | 16 +-- 128 files changed, 1415 insertions(+), 1079 deletions(-) create mode 100644 src/combustionModels/radiationModels/absorptionEmissionModels/greyMeanCombustion/greyMeanCombustion.C create mode 100644 src/combustionModels/radiationModels/absorptionEmissionModels/greyMeanCombustion/greyMeanCombustion.H create mode 100644 src/combustionModels/radiationModels/absorptionEmissionModels/wideBandCombustion/wideBandCombustion.C create mode 100644 src/combustionModels/radiationModels/absorptionEmissionModels/wideBandCombustion/wideBandCombustion.H rename src/{thermophysicalModels/radiation => radiationModels}/Make/files (51%) rename src/{thermophysicalModels/radiation => radiationModels}/Make/options (100%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel => radiationModels/absorptionEmissionModels}/absorptionEmissionModel/absorptionEmissionModel.C (73%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel => radiationModels/absorptionEmissionModels}/absorptionEmissionModel/absorptionEmissionModel.H (96%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel => radiationModels/absorptionEmissionModels}/absorptionEmissionModel/absorptionEmissionModelNew.C (92%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C => radiationModels/absorptionEmissionModels/binary/binary.C} (71%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H => radiationModels/absorptionEmissionModels/binary/binary.H} (86%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel => radiationModels/absorptionEmissionModels}/constantAbsorptionEmission/constantAbsorptionEmission.C (78%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel => radiationModels/absorptionEmissionModels}/constantAbsorptionEmission/constantAbsorptionEmission.H (87%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C => radiationModels/absorptionEmissionModels/greyMean/greyMean.C} (78%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H => radiationModels/absorptionEmissionModels/greyMean/greyMean.H} (76%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C => radiationModels/absorptionEmissionModels/greyMeanSolid/greyMeanSolid.C} (85%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H => radiationModels/absorptionEmissionModels/greyMeanSolid/greyMeanSolid.H} (86%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel => radiationModels/absorptionEmissionModels}/noAbsorptionEmission/noAbsorptionEmission.C (76%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel => radiationModels/absorptionEmissionModels}/noAbsorptionEmission/noAbsorptionEmission.H (88%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C => radiationModels/absorptionEmissionModels/wideBand/wideBand.C} (75%) rename src/{thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H => radiationModels/absorptionEmissionModels/wideBand/wideBand.H} (66%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C (85%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.H (98%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C (87%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.H (98%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C (88%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H (96%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C (86%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.H (95%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C (86%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H (97%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C (86%) rename src/{thermophysicalModels/radiation => radiationModels}/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H (96%) rename src/{thermophysicalModels/radiation => radiationModels}/fvOptions/radiation/radiation.C (95%) rename src/{thermophysicalModels/radiation => radiationModels}/fvOptions/radiation/radiation.H (96%) rename src/{thermophysicalModels/radiation => radiationModels}/include/createIncompressibleRadiationModel.H (83%) create mode 100644 src/radiationModels/include/createRadiationModel.H rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/P1/P1.C (91%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/P1/P1.H (95%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C (84%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.H (93%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffsI.H (69%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C (93%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.H (96%) rename src/{thermophysicalModels/radiation/radiationModels/fvDOM => radiationModels/radiationModels}/fvDOM/fvDOM.C (94%) rename src/{thermophysicalModels/radiation/radiationModels/fvDOM => radiationModels/radiationModels}/fvDOM/fvDOM.H (97%) rename src/{thermophysicalModels/radiation/radiationModels/fvDOM => radiationModels/radiationModels}/fvDOM/fvDOMI.H (60%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C (94%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H (97%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H (61%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/noRadiation/noRadiation.C (78%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/noRadiation/noRadiation.H (94%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/opaqueSolid/opaqueSolid.C (79%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/opaqueSolid/opaqueSolid.H (94%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/radiationModel/radiationModel.C (77%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/radiationModel/radiationModel.H (93%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/radiationModel/radiationModelNew.C (92%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/viewFactor/viewFactor.C (94%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/viewFactor/viewFactor.H (96%) rename src/{thermophysicalModels/radiation => radiationModels}/radiationModels/viewFactor/viewFactorI.H (89%) rename src/{thermophysicalModels/radiation/submodels/scatterModel => radiationModels/scatterModels}/constantScatter/constantScatter.C (84%) rename src/{thermophysicalModels/radiation/submodels/scatterModel => radiationModels/scatterModels}/constantScatter/constantScatter.H (85%) rename src/{thermophysicalModels/radiation/submodels/scatterModel => radiationModels/scatterModels}/noScatter/noScatter.C (80%) rename src/{thermophysicalModels/radiation/submodels/scatterModel => radiationModels/scatterModels}/noScatter/noScatter.H (90%) rename src/{thermophysicalModels/radiation/submodels/scatterModel => radiationModels/scatterModels}/scatterModel/scatterModel.C (84%) rename src/{thermophysicalModels/radiation/submodels/scatterModel => radiationModels/scatterModels}/scatterModel/scatterModel.H (94%) rename src/{thermophysicalModels/radiation/submodels/scatterModel => radiationModels/scatterModels}/scatterModel/scatterModelNew.C (92%) rename src/{thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C => radiationModels/sootModels/mixtureFraction/mixtureFraction.C} (91%) rename src/{thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H => radiationModels/sootModels/mixtureFraction/mixtureFraction.H} (88%) rename src/{thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoots.C => radiationModels/sootModels/mixtureFraction/mixtureFractions.C} (85%) rename src/{thermophysicalModels/radiation/submodels/sootModel => radiationModels/sootModels}/noSoot/noSoot.C (74%) rename src/{thermophysicalModels/radiation/submodels/sootModel => radiationModels/sootModels}/noSoot/noSoot.H (90%) rename src/{thermophysicalModels/radiation/submodels/sootModel => radiationModels/sootModels}/sootModel/makeSootTypes.H (67%) rename src/{thermophysicalModels/radiation/submodels/sootModel => radiationModels/sootModels}/sootModel/sootModel.C (87%) rename src/{thermophysicalModels/radiation/submodels/sootModel => radiationModels/sootModels}/sootModel/sootModel.H (85%) rename src/{thermophysicalModels/radiation/submodels/sootModel => radiationModels/sootModels}/sootModel/sootModelNew.C (93%) delete mode 100644 src/thermophysicalModels/radiation/include/createRadiationModel.H diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index b50245d7ed..888e7f99ae 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -16,7 +16,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/regionModels/pyrolysisModels/lnInclude \ diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options index 043be5d13c..7e2cfae243 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options index 9046994122..aaeaf96baf 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options index 934083f2bb..5488b6d63f 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options index 0d9433bac7..5170ca5d57 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index 2b98361211..96f1f137d2 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options @@ -19,7 +19,7 @@ EXE_INC = \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index fc31a93e8b..66028b7d28 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -10,7 +10,7 @@ PtrList ghfFluid(fluidRegions.size()); PtrList turbulenceFluid(fluidRegions.size()); PtrList> reactionFluid(fluidRegions.size()); PtrList p_rghFluid(fluidRegions.size()); -PtrList radiation(fluidRegions.size()); +PtrList radiation(fluidRegions.size()); PtrList KFluid(fluidRegions.size()); PtrList dpdtFluid(fluidRegions.size()); PtrList::fieldTable> @@ -194,7 +194,7 @@ forAll(fluidRegions, i) radiation.set ( i, - radiation::radiationModel::New(thermoFluid[i].T()) + radiationModel::New(thermoFluid[i].T()) ); initialMassFluid[i] = fvc::domainIntegrate(rhoFluid[i]).value(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H index 827987963b..0e08ee5249 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H @@ -43,7 +43,7 @@ multivariateSurfaceInterpolationScheme::fieldTable& fields = fieldsFluid[i]; - radiation::radiationModel& rad = radiation[i]; + radiationModel& rad = radiation[i]; IOMRFZoneList& MRF = MRFfluid[i]; fv::options& fvOptions = fluidFvOptions[i]; diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H index 1f164488cb..9121c3deb0 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H @@ -1,7 +1,7 @@ // Initialise solid field pointer lists PtrList coordinates(solidRegions.size()); PtrList thermos(solidRegions.size()); -PtrList radiations(solidRegions.size()); +PtrList radiations(solidRegions.size()); PtrList solidHeatSources(solidRegions.size()); PtrList betavSolid(solidRegions.size()); PtrList aniAlphas(solidRegions.size()); @@ -16,7 +16,7 @@ forAll(solidRegions, i) thermos.set(i, solidThermo::New(solidRegions[i])); Info<< " Adding to radiations\n" << endl; - radiations.set(i, radiation::radiationModel::New(thermos[i].T())); + radiations.set(i, radiationModel::New(thermos[i].T())); Info<< " Adding fvOptions\n" << endl; solidHeatSources.set diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options index 934083f2bb..5488b6d63f 100644 --- a/applications/solvers/heatTransfer/thermoFoam/Make/options +++ b/applications/solvers/heatTransfer/thermoFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options index 74f9041da0..b24c882138 100644 --- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options @@ -7,7 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options index 67374724f9..b6a8737049 100644 --- a/applications/solvers/lagrangian/DPMFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index c4a1e2feb5..e55832d24a 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -14,7 +14,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 3951ecdbf7..f533371a97 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -14,7 +14,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options index a67ee74ec2..4718912632 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options @@ -15,7 +15,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index 38dd84ca10..30bd2b7b72 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/Make/options @@ -18,7 +18,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options index f4506588f7..afd395867e 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options @@ -18,7 +18,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/engine/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options index 45524dff69..3e79386ab0 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/test/Function1/Make/options b/applications/test/Function1/Make/options index f7182cb4c5..5854e1004e 100644 --- a/applications/test/Function1/Make/options +++ b/applications/test/Function1/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -DFULLDEBUG -g -O0 \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/src/Allwmake b/src/Allwmake index 93cc1f8817..d3ace5febe 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -56,6 +56,7 @@ wmake $targetType randomProcesses transportModels/Allwmake $targetType $* thermophysicalModels/Allwmake $targetType $* TurbulenceModels/Allwmake $targetType $* +wmake $targetType radiationModels wmake $targetType combustionModels regionModels/Allwmake $targetType $* lagrangian/Allwmake $targetType $* diff --git a/src/combustionModels/Make/files b/src/combustionModels/Make/files index 25b1e01489..03b7327532 100644 --- a/src/combustionModels/Make/files +++ b/src/combustionModels/Make/files @@ -22,4 +22,7 @@ noCombustion/noCombustions.C functionObjects/Qdot/Qdot.C +radiationModels/absorptionEmissionModels/greyMeanCombustion/greyMeanCombustion.C +radiationModels/absorptionEmissionModels/wideBandCombustion/wideBandCombustion.C + LIB = $(FOAM_LIBBIN)/libcombustionModels diff --git a/src/combustionModels/Make/options b/src/combustionModels/Make/options index e660ccd9f6..b779f2ebb1 100644 --- a/src/combustionModels/Make/options +++ b/src/combustionModels/Make/options @@ -6,6 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -14,5 +15,6 @@ LIB_LIBS = \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ -lchemistryModel \ + -lradiationModels \ -lfiniteVolume \ -lmeshTools diff --git a/src/combustionModels/radiationModels/absorptionEmissionModels/greyMeanCombustion/greyMeanCombustion.C b/src/combustionModels/radiationModels/absorptionEmissionModels/greyMeanCombustion/greyMeanCombustion.C new file mode 100644 index 0000000000..1122614a70 --- /dev/null +++ b/src/combustionModels/radiationModels/absorptionEmissionModels/greyMeanCombustion/greyMeanCombustion.C @@ -0,0 +1,89 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "greyMeanCombustion.H" +#include "combustionModel.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ +namespace radiationModels +{ +namespace absorptionEmissionModels +{ + defineTypeNameAndDebug(greyMeanCombustion, 0); + + addToRunTimeSelectionTable + ( + absorptionEmissionModel, + greyMeanCombustion, + dictionary + ); +} +} +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::radiationModels::absorptionEmissionModels::greyMeanCombustion:: +greyMeanCombustion +( + const dictionary& dict, + const fvMesh& mesh +) +: + greyMean(dict, mesh, typeName), + EhrrCoeff_(readScalar(coeffsDict_.lookup("EhrrCoeff"))) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::radiationModels::absorptionEmissionModels::greyMeanCombustion:: +~greyMeanCombustion() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::tmp +Foam::radiationModels::absorptionEmissionModels::greyMeanCombustion::ECont +( + const label bandI +) const +{ + tmp E = greyMean::ECont(bandI); + + const word& name = combustionModel::combustionPropertiesName; + E.ref() += EhrrCoeff_*mesh_.lookupObject(name).Qdot(); + + return E; +} + + +// ************************************************************************* // diff --git a/src/combustionModels/radiationModels/absorptionEmissionModels/greyMeanCombustion/greyMeanCombustion.H b/src/combustionModels/radiationModels/absorptionEmissionModels/greyMeanCombustion/greyMeanCombustion.H new file mode 100644 index 0000000000..49061afd80 --- /dev/null +++ b/src/combustionModels/radiationModels/absorptionEmissionModels/greyMeanCombustion/greyMeanCombustion.H @@ -0,0 +1,103 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::radiationModels::absorptionEmission::greyMeanCombustion + +Description + greyMeanCombustion radiation absorption and emission coefficients for + continuous phase. Exactly as greyMean, but with additional effects of the + combustion heat release rate included. + +See also + Foam::radiationModels::absorptionEmissionModels::greyMean + +SourceFiles + greyMeanCombustion.C + +\*---------------------------------------------------------------------------*/ + +#ifndef greyMeanCombustion_H +#define greyMeanCombustion_H + +#include "greyMean.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace radiationModels +{ +namespace absorptionEmissionModels +{ + +/*---------------------------------------------------------------------------*\ + Class greyMeanCombustion Declaration +\*---------------------------------------------------------------------------*/ + +class greyMeanCombustion +: + public greyMean +{ +private: + + // Private data + + //- Emission constant coefficient + const scalar EhrrCoeff_; + + +public: + + //- Runtime type information + TypeName("greyMeanCombustion"); + + + // Constructors + + //- Construct from components + greyMeanCombustion(const dictionary& dict, const fvMesh& mesh); + + + //- Destructor + virtual ~greyMeanCombustion(); + + + // Member Functions + + //- Emission contribution for continuous phase + tmp ECont(const label bandI = 0) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace absorptionEmissionModels +} // End namespace radiationModels +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/combustionModels/radiationModels/absorptionEmissionModels/wideBandCombustion/wideBandCombustion.C b/src/combustionModels/radiationModels/absorptionEmissionModels/wideBandCombustion/wideBandCombustion.C new file mode 100644 index 0000000000..93713b12e9 --- /dev/null +++ b/src/combustionModels/radiationModels/absorptionEmissionModels/wideBandCombustion/wideBandCombustion.C @@ -0,0 +1,102 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "wideBandCombustion.H" +#include "combustionModel.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ +namespace radiationModels +{ +namespace absorptionEmissionModels +{ + defineTypeNameAndDebug(wideBandCombustion, 0); + + addToRunTimeSelectionTable + ( + absorptionEmissionModel, + wideBandCombustion, + dictionary + ); +} +} +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::radiationModels::absorptionEmissionModels::wideBandCombustion:: +wideBandCombustion +( + const dictionary& dict, + const fvMesh& mesh +) +: + wideBand(dict, mesh, typeName) +{ + label bandi = 0; + forAllConstIter(dictionary, coeffsDict_, iter) + { + if (!iter().isDict()) continue; + + iter().dict().lookup("EhrrCoeff") >> iEhrrCoeffs_[bandi]; + + ++ bandi; + } +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::radiationModels::absorptionEmissionModels::wideBandCombustion:: +~wideBandCombustion() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::tmp +Foam::radiationModels::absorptionEmissionModels::wideBandCombustion::ECont +( + const label bandi +) const +{ + tmp E = wideBand::ECont(bandi); + + const word& name = combustionModel::combustionPropertiesName; + E.ref() += + iEhrrCoeffs_[bandi] + *mesh_.lookupObject(name).Qdot() + *(iBands_[bandi][1] - iBands_[bandi][0]) + /totalWaveLength_; + + return E; +} + + +// ************************************************************************* // diff --git a/src/combustionModels/radiationModels/absorptionEmissionModels/wideBandCombustion/wideBandCombustion.H b/src/combustionModels/radiationModels/absorptionEmissionModels/wideBandCombustion/wideBandCombustion.H new file mode 100644 index 0000000000..ed09a04c17 --- /dev/null +++ b/src/combustionModels/radiationModels/absorptionEmissionModels/wideBandCombustion/wideBandCombustion.H @@ -0,0 +1,101 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::radiationModels::absorptionEmission::wideBandCombustion + +Description + wideBandCombustion radiation absorption and emission coefficients for + continuous phase. Exactly as wideBand, but with additional effects of the + combustion heat release rate included. + +See also + Foam::radiationModels::absorptionEmissionModels::wideBand + +SourceFiles + wideBandCombustion.C + +\*---------------------------------------------------------------------------*/ + +#ifndef wideBandCombustion_H +#define wideBandCombustion_H + +#include "wideBand.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace radiationModels +{ +namespace absorptionEmissionModels +{ + +/*---------------------------------------------------------------------------*\ + Class wideBandCombustion Declaration +\*---------------------------------------------------------------------------*/ + +class wideBandCombustion +: + public wideBand +{ +private: + + //- Proportion of the heat released rate emitted + FixedList iEhrrCoeffs_; + + +public: + + //- Runtime type information + TypeName("wideBandCombustion"); + + + // Constructors + + //- Construct from components + wideBandCombustion(const dictionary& dict, const fvMesh& mesh); + + + //- Destructor + virtual ~wideBandCombustion(); + + + // Member Functions + + //- Emission contribution for continuous phase + tmp ECont(const label bandi = 0) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace absorptionEmissionModels +} // End namespace radiationModels +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index 6687004631..7d44435831 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -8,7 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index 6b1b5c901c..be38c8f76c 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -7,7 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C index 13965f806e..ff06cef7d1 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,23 +31,26 @@ License namespace Foam { - namespace radiation - { - defineTypeNameAndDebug(cloudAbsorptionEmission, 0); +namespace radiationModels +{ +namespace absorptionEmissionModels +{ + defineTypeNameAndDebug(cloud, 0); - addToRunTimeSelectionTable - ( - absorptionEmissionModel, - cloudAbsorptionEmission, - dictionary - ); - } + addToRunTimeSelectionTable + ( + absorptionEmissionModel, + cloud, + dictionary + ); +} +} } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::radiation::cloudAbsorptionEmission::cloudAbsorptionEmission +Foam::radiationModels::absorptionEmissionModels::cloud::cloud ( const dictionary& dict, const fvMesh& mesh @@ -61,14 +64,14 @@ Foam::radiation::cloudAbsorptionEmission::cloudAbsorptionEmission // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::radiation::cloudAbsorptionEmission::~cloudAbsorptionEmission() +Foam::radiationModels::absorptionEmissionModels::cloud::~cloud() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // Foam::tmp -Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const +Foam::radiationModels::absorptionEmissionModels::cloud::aDisp(const label) const { tmp ta ( @@ -95,7 +98,10 @@ Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const Foam::tmp -Foam::radiation::cloudAbsorptionEmission::eDisp(const label bandI) const +Foam::radiationModels::absorptionEmissionModels::cloud::eDisp +( + const label bandI +) const { tmp te ( @@ -112,7 +118,10 @@ Foam::radiation::cloudAbsorptionEmission::eDisp(const label bandI) const Foam::tmp -Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const +Foam::radiationModels::absorptionEmissionModels::cloud::EDisp +( + const label bandI +) const { tmp tE ( diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H index 70d67707fa..9ffb54b0dc 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::radiation::cloudAbsorptionEmission + Foam::radiationModels::absorptionEmissionModels::cloud Description Retrieves absorption/emission data from a cloud object @@ -41,14 +41,16 @@ SourceFiles namespace Foam { -namespace radiation +namespace radiationModels +{ +namespace absorptionEmissionModels { /*---------------------------------------------------------------------------*\ - Class cloudAbsorptionEmission Declaration + Class cloud Declaration \*---------------------------------------------------------------------------*/ -class cloudAbsorptionEmission +class cloud : public absorptionEmissionModel { @@ -64,45 +66,36 @@ class cloudAbsorptionEmission public: //- Runtime type information - TypeName("cloudAbsorptionEmission"); + TypeName("cloud"); // Constructors //- Construct from components - cloudAbsorptionEmission(const dictionary& dict, const fvMesh& mesh); + cloud(const dictionary& dict, const fvMesh& mesh); //- Destructor - virtual ~cloudAbsorptionEmission(); + virtual ~cloud(); - // Member Operators + // Member Functions - // Access + //- Absorption coefficient for dispersed phase + virtual tmp aDisp(const label bandI = 0) const; - // Absorption coefficient + //- Emission coefficient for dispersed phase + virtual tmp eDisp(const label bandI = 0) const; - //- Absorption coefficient for dispersed phase - virtual tmp aDisp(const label bandI = 0) const; - - - // Emission coefficient - - //- Emission coefficient for dispersed phase - virtual tmp eDisp(const label bandI = 0) const; - - - // Emission contribution - - //- Return emission contribution for dispersed phase - virtual tmp EDisp(const label bandI = 0) const; + //- Return emission contribution for dispersed phase + virtual tmp EDisp(const label bandI = 0) const; }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace radiation +} // End namespace absorptionEmissionModels +} // End namespace radiationModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C index 628872f563..8ef29dca23 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,23 +31,26 @@ License namespace Foam { - namespace radiation - { - defineTypeNameAndDebug(cloudScatter, 0); +namespace radiationModels +{ +namespace scatterModels +{ + defineTypeNameAndDebug(cloud, 0); - addToRunTimeSelectionTable - ( - scatterModel, - cloudScatter, - dictionary - ); - } + addToRunTimeSelectionTable + ( + scatterModel, + cloud, + dictionary + ); +} +} } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::radiation::cloudScatter::cloudScatter +Foam::radiationModels::scatterModels::cloud::cloud ( const dictionary& dict, const fvMesh& mesh @@ -61,14 +64,14 @@ Foam::radiation::cloudScatter::cloudScatter // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::radiation::cloudScatter::~cloudScatter() +Foam::radiationModels::scatterModels::cloud::~cloud() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // Foam::tmp -Foam::radiation::cloudScatter::sigmaEff() const +Foam::radiationModels::scatterModels::cloud::sigmaEff() const { tmp tsigma ( diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H index 44ab6f05f0..039772d17e 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::radiation::cloudScatter + Foam::radiationModels::scatterModels::cloud Description Cloud radiation scatter model @@ -41,14 +41,16 @@ SourceFiles namespace Foam { -namespace radiation +namespace radiationModels +{ +namespace scatterModels { /*---------------------------------------------------------------------------*\ - Class cloudScatter Declaration + Class cloud Declaration \*---------------------------------------------------------------------------*/ -class cloudScatter +class cloud : public scatterModel { @@ -64,35 +66,30 @@ class cloudScatter public: //- Runtime type information - TypeName("cloudScatter"); + TypeName("cloud"); // Constructors //- Construct from components - cloudScatter - ( - const dictionary& dict, - const fvMesh& mesh - ); + cloud(const dictionary& dict, const fvMesh& mesh); //- Destructor - virtual ~cloudScatter(); + virtual ~cloud(); - // Member Operators + // Member Functions - // Access - - //- Return scatter coefficient - tmp sigmaEff() const; + //- Return scatter coefficient + tmp sigmaEff() const; }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace radiation +} // End namespace scatterModels +} // End namespace radiationModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options index 2f941fe323..d1eb06b773 100644 --- a/src/lagrangian/spray/Make/options +++ b/src/lagrangian/spray/Make/options @@ -9,7 +9,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ diff --git a/src/thermophysicalModels/radiation/Make/files b/src/radiationModels/Make/files similarity index 51% rename from src/thermophysicalModels/radiation/Make/files rename to src/radiationModels/Make/files index 81ad973eb3..8556db1a62 100644 --- a/src/thermophysicalModels/radiation/Make/files +++ b/src/radiationModels/Make/files @@ -3,7 +3,7 @@ radiationModels/radiationModel/radiationModel.C radiationModels/radiationModel/radiationModelNew.C radiationModels/noRadiation/noRadiation.C radiationModels/P1/P1.C -radiationModels/fvDOM/fvDOM/fvDOM.C +radiationModels/fvDOM/fvDOM.C radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C @@ -11,26 +11,26 @@ radiationModels/viewFactor/viewFactor.C radiationModels/opaqueSolid/opaqueSolid.C /* Scatter model */ -submodels/scatterModel/scatterModel/scatterModel.C -submodels/scatterModel/scatterModel/scatterModelNew.C -submodels/scatterModel/noScatter/noScatter.C -submodels/scatterModel/constantScatter/constantScatter.C +scatterModels/scatterModel/scatterModel.C +scatterModels/scatterModel/scatterModelNew.C +scatterModels/noScatter/noScatter.C +scatterModels/constantScatter/constantScatter.C /* Absorption/Emission model */ -submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C -submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C -submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C -submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C -submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C -submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C -submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C -submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C +absorptionEmissionModels/absorptionEmissionModel/absorptionEmissionModel.C +absorptionEmissionModels/absorptionEmissionModel/absorptionEmissionModelNew.C +absorptionEmissionModels/noAbsorptionEmission/noAbsorptionEmission.C +absorptionEmissionModels/constantAbsorptionEmission/constantAbsorptionEmission.C +absorptionEmissionModels/binary/binary.C +absorptionEmissionModels/greyMean/greyMean.C +absorptionEmissionModels/wideBand/wideBand.C +absorptionEmissionModels/greyMeanSolid/greyMeanSolid.C /* Soot model */ -submodels/sootModel/sootModel/sootModel.C -submodels/sootModel/sootModel/sootModelNew.C -submodels/sootModel/mixtureFractionSoot/mixtureFractionSoots.C -submodels/sootModel/noSoot/noSoot.C +sootModels/sootModel/sootModel.C +sootModels/sootModel/sootModelNew.C +sootModels/mixtureFraction/mixtureFractions.C +sootModels/noSoot/noSoot.C /* Boundary conditions */ derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C diff --git a/src/thermophysicalModels/radiation/Make/options b/src/radiationModels/Make/options similarity index 100% rename from src/thermophysicalModels/radiation/Make/options rename to src/radiationModels/Make/options diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C b/src/radiationModels/absorptionEmissionModels/absorptionEmissionModel/absorptionEmissionModel.C similarity index 73% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C rename to src/radiationModels/absorptionEmissionModels/absorptionEmissionModel/absorptionEmissionModel.C index 11d122d671..871bcf0812 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C +++ b/src/radiationModels/absorptionEmissionModels/absorptionEmissionModel/absorptionEmissionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ License namespace Foam { - namespace radiation + namespace radiationModels { defineTypeNameAndDebug(absorptionEmissionModel, 0); defineRunTimeSelectionTable(absorptionEmissionModel, dictionary); @@ -38,7 +38,7 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::radiation::absorptionEmissionModel::absorptionEmissionModel +Foam::radiationModels::absorptionEmissionModel::absorptionEmissionModel ( const dictionary& dict, const fvMesh& mesh @@ -51,21 +51,21 @@ Foam::radiation::absorptionEmissionModel::absorptionEmissionModel // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // -Foam::radiation::absorptionEmissionModel::~absorptionEmissionModel() +Foam::radiationModels::absorptionEmissionModel::~absorptionEmissionModel() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // Foam::tmp -Foam::radiation::absorptionEmissionModel::a(const label bandI) const +Foam::radiationModels::absorptionEmissionModel::a(const label bandI) const { return aDisp(bandI) + aCont(bandI); } Foam::tmp -Foam::radiation::absorptionEmissionModel::aCont(const label bandI) const +Foam::radiationModels::absorptionEmissionModel::aCont(const label bandI) const { return volScalarField::New ( @@ -77,7 +77,7 @@ Foam::radiation::absorptionEmissionModel::aCont(const label bandI) const Foam::tmp -Foam::radiation::absorptionEmissionModel::aDisp(const label bandI) const +Foam::radiationModels::absorptionEmissionModel::aDisp(const label bandI) const { return volScalarField::New ( @@ -89,14 +89,14 @@ Foam::radiation::absorptionEmissionModel::aDisp(const label bandI) const Foam::tmp -Foam::radiation::absorptionEmissionModel::e(const label bandI) const +Foam::radiationModels::absorptionEmissionModel::e(const label bandI) const { return eDisp(bandI) + eCont(bandI); } Foam::tmp -Foam::radiation::absorptionEmissionModel::eCont(const label bandI) const +Foam::radiationModels::absorptionEmissionModel::eCont(const label bandI) const { return volScalarField::New ( @@ -108,7 +108,7 @@ Foam::radiation::absorptionEmissionModel::eCont(const label bandI) const Foam::tmp -Foam::radiation::absorptionEmissionModel::eDisp(const label bandI) const +Foam::radiationModels::absorptionEmissionModel::eDisp(const label bandI) const { return volScalarField::New ( @@ -120,14 +120,14 @@ Foam::radiation::absorptionEmissionModel::eDisp(const label bandI) const Foam::tmp -Foam::radiation::absorptionEmissionModel::E(const label bandI) const +Foam::radiationModels::absorptionEmissionModel::E(const label bandI) const { return EDisp(bandI) + ECont(bandI); } Foam::tmp -Foam::radiation::absorptionEmissionModel::ECont(const label bandI) const +Foam::radiationModels::absorptionEmissionModel::ECont(const label bandI) const { return volScalarField::New ( @@ -139,7 +139,7 @@ Foam::radiation::absorptionEmissionModel::ECont(const label bandI) const Foam::tmp -Foam::radiation::absorptionEmissionModel::EDisp(const label bandI) const +Foam::radiationModels::absorptionEmissionModel::EDisp(const label bandI) const { return volScalarField::New ( @@ -150,26 +150,26 @@ Foam::radiation::absorptionEmissionModel::EDisp(const label bandI) const } -Foam::label Foam::radiation::absorptionEmissionModel::nBands() const +Foam::label Foam::radiationModels::absorptionEmissionModel::nBands() const { return pTraits