From b292fc6d8dccef2ca9dea59513e198fe67e2d146 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Fri, 1 Feb 2019 11:49:55 +0000 Subject: [PATCH] radiation: Changed to dictionary constructors for dimensioned types This allows coefficients of the constantAbsorptionEmission and constantScatter to be entered as pure numbers, with the name and dimensions set automatically, rather than having to specify them manually. --- .../constantAbsorptionEmission.C | 8 ++++---- .../scatterModel/constantScatter/constantScatter.C | 6 +++--- .../constant/radiationProperties | 6 +++--- .../constant/radiationProperties | 6 +++--- .../LES/smallPoolFire2D/constant/radiationProperties | 6 +++--- .../LES/smallPoolFire3D/constant/radiationProperties | 6 +++--- .../RAS/SandiaD_LTS/constant/radiationProperties | 5 ----- .../RAS/SandiaD_LTS/constant/reactionsGRI | 1 - .../hotRadiationRoom/constant/radiationProperties | 6 +++--- .../constant/radiationProperties | 6 +++--- .../constant/heater/radiationProperties | 6 +++--- .../constant/bottomAir/radiationProperties | 6 +++--- .../constant/heater/radiationProperties | 6 +++--- .../simplifiedSiwek/constant/radiationProperties | 11 +++-------- 14 files changed, 37 insertions(+), 48 deletions(-) diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C index ad6f1e6a65..25fef0e509 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.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 @@ -54,9 +54,9 @@ Foam::radiation::constantAbsorptionEmission::constantAbsorptionEmission : absorptionEmissionModel(dict, mesh), coeffsDict_(dict.optionalSubDict(typeName + "Coeffs")), - a_(coeffsDict_.lookup("absorptivity")), - e_(coeffsDict_.lookup("emissivity")), - E_(coeffsDict_.lookup("E")) + a_("absorptivity", dimless/dimLength, coeffsDict_), + e_("emissivity", dimless/dimLength, coeffsDict_), + E_("E", dimMass/dimLength/pow3(dimTime), coeffsDict_) {} diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C index df39ffbbd0..261eee323a 100644 --- a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C +++ b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.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 @@ -54,8 +54,8 @@ Foam::radiation::constantScatter::constantScatter : scatterModel(dict, mesh), coeffsDict_(dict.optionalSubDict(typeName + "Coeffs")), - sigma_(coeffsDict_.lookup("sigma")), - C_(coeffsDict_.lookup("C")) + sigma_("sigma", dimless/dimLength, coeffsDict_), + C_("C", dimless, coeffsDict_) {} diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties index 1bb13b8ffd..b5def33eb5 100644 --- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties +++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties @@ -35,9 +35,9 @@ absorptionEmissionModel constantAbsorptionEmission; constantAbsorptionEmissionCoeffs { - absorptivity absorptivity [0 -1 0 0 0 0 0] 0.1; - emissivity emissivity [0 -1 0 0 0 0 0] 0.1; - E E [1 -1 -3 0 0 0 0] 0; + absorptivity 0.1; + emissivity 0.1; + E 0; } greyMeanAbsorptionEmissionSootCoeffs diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties index 4aa6c34ce3..e3f65261ed 100644 --- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties +++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties @@ -35,9 +35,9 @@ absorptionEmissionModel constantAbsorptionEmission; constantAbsorptionEmissionCoeffs { - absorptivity absorptivity [ m^-1 ] 0.01; - emissivity emissivity [ m^-1 ] 0.01; - E E [ kg m^-1 s^-3 ] 0; + absorptivity 0.01; + emissivity 0.01; + E 0; } greyMeanAbsorptionEmissionCoeffs diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties index 19c156c087..7ff705c767 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties @@ -34,9 +34,9 @@ absorptionEmissionModel greyMeanAbsorptionEmission; constantAbsorptionEmissionCoeffs { - absorptivity absorptivity [ m^-1 ] 0.01; - emissivity emissivity [ m^-1 ] 0.01; - E E [ kg m^-1 s^-3 ] 0; + absorptivity 0.01; + emissivity 0.01; + E 0; } greyMeanAbsorptionEmissionCoeffs diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties index 114c5f085d..8cc54e2d46 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties @@ -35,9 +35,9 @@ absorptionEmissionModel greyMeanAbsorptionEmission; constantAbsorptionEmissionCoeffs { - absorptivity absorptivity [ m^-1 ] 0.01; - emissivity emissivity [ m^-1 ] 0.01; - E E [ kg m^-1 s^-3 ] 0; + absorptivity 0.01; + emissivity 0.01; + E 0; } greyMeanAbsorptionEmissionCoeffs diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/radiationProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/radiationProperties index 1da3f55abe..cf56cd105e 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/radiationProperties +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/radiationProperties @@ -20,11 +20,6 @@ radiation on; radiationModel P1; -P1Coeffs -{ - C C [0 0 0 0 0 0 0] 0; -} - // Number of flow iterations per radiation iteration solverFreq 1; diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/reactionsGRI b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/reactionsGRI index 57825a2f0a..21511f515c 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/reactionsGRI +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/reactionsGRI @@ -3611,4 +3611,3 @@ reactions Tlow 250; Thigh 5000; - diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties index 2347ad2b6f..abeb842532 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties @@ -26,9 +26,9 @@ absorptionEmissionModel constantAbsorptionEmission; constantAbsorptionEmissionCoeffs { - absorptivity absorptivity [0 -1 0 0 0 0 0] 0.5; - emissivity emissivity [0 -1 0 0 0 0 0] 0.5; - E E [1 -1 -3 0 0 0 0] 0; + absorptivity 0.5; + emissivity 0.5; + E 0; } scatterModel none; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties index edf84f4b30..eb09e79715 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties @@ -34,9 +34,9 @@ absorptionEmissionModel constantAbsorptionEmission; constantAbsorptionEmissionCoeffs { - absorptivity absorptivity [ m^-1 ] 0.5; - emissivity emissivity [ m^-1 ] 0.5; - E E [ kg m^-1 s^-3 ] 0; + absorptivity 0.5; + emissivity 0.5; + E 0; } scatterModel none; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties index 79ece9b1f7..3d3090c98c 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties @@ -24,9 +24,9 @@ absorptionEmissionModel constantAbsorptionEmission; constantAbsorptionEmissionCoeffs { - absorptivity absorptivity [0 -1 0 0 0 0 0] 0.0; // opaque - emissivity emissivity [0 -1 0 0 0 0 0] 0.1; - E E [1 -1 -3 0 0 0 0] 0; + absorptivity 0.0; // opaque + emissivity 0.1; + E 0; } scatterModel none; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties index 6efd7aa2c1..da669542c1 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties @@ -33,9 +33,9 @@ absorptionEmissionModel constantAbsorptionEmission; constantAbsorptionEmissionCoeffs { - absorptivity absorptivity [0 -1 0 0 0 0 0] 0.01; - emissivity emissivity [0 -1 0 0 0 0 0] 0.01; - E E [1 -1 -3 0 0 0 0] 0; + absorptivity 0.01; + emissivity 0.01; + E 0; } scatterModel none; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties index 1e89e70558..683c164dd5 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties @@ -24,9 +24,9 @@ absorptionEmissionModel constantAbsorptionEmission; constantAbsorptionEmissionCoeffs { - absorptivity absorptivity [0 -1 0 0 0 0 0] 0.0; // opaque - emissivity emissivity [0 -1 0 0 0 0 0] 0.1; - E E [1 -1 -3 0 0 0 0] 0; + absorptivity 0.0; // opaque + emissivity 0.1; + E 0; } scatterModel none; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties index 84b6b99082..c8dc557fcf 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties @@ -19,11 +19,6 @@ solverFreq 1; radiationModel P1; -P1Coeffs -{ - C C [0 0 0 0 0 0 0] 0; -} - absorptionEmissionModel binaryAbsorptionEmission; binaryAbsorptionEmissionCoeffs @@ -33,9 +28,9 @@ binaryAbsorptionEmissionCoeffs absorptionEmissionModel constantAbsorptionEmission; constantAbsorptionEmissionCoeffs { - absorptivity absorptivity [0 -1 0 0 0 0 0] 0.5; - emissivity emissivity [0 -1 0 0 0 0 0] 0.5; - E E [1 -1 -3 0 0 0 0] 0; + absorptivity 0.5; + emissivity 0.5; + E 0; } } model2