From 54432bb18a218d69586977ad1ed0683acb996f28 Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 5 Oct 2012 11:48:48 +0100 Subject: [PATCH] ENH: Adding greyMeanSolidAbsorptionEmission, updating tutorial. The radiative properties are now held in the radiationModel in the solid region instead than in the solidThermo --- .../pyrolysisModels/noPyrolysis/noPyrolysis.C | 9 +- .../pyrolysisModels/noPyrolysis/noPyrolysis.H | 4 + .../pyrolysisModel/pyrolysisModel.C | 11 +- .../pyrolysisModel/pyrolysisModel.H | 4 - .../reactingOneDim/reactingOneDim.C | 6 +- .../reactingOneDim/reactingOneDim.H | 5 +- .../radiationCoupledBase.C | 6 +- .../radiationCoupledBase.H | 2 +- .../radiationModel/radiationModel.C | 2 +- .../constantAbsorptionEmission.C | 4 +- .../greyMeanSolidAbsorptionEmission.C | 50 +- .../greyMeanSolidAbsorptionEmission.H | 6 +- .../les/oppositeBurningPanels/0/IDefault | 2 +- .../oppositeBurningPanels/0/panelRegion/Ychar | 2 +- .../oppositeBurningPanels/0/panelRegion/Yv | 2 +- .../constant/panelRegion/polyMesh/boundary | 6887 + .../polyMesh/cellToPatchFaceAddressing | 34105 +++ .../constant/panelRegion/polyMesh/cellZones | 21 + .../polyMesh/faceToPatchEdgeAddressing | 177241 +++++++++++++++ .../polyMesh/faceToPatchFaceAddressing | 177241 +++++++++++++++ .../constant/panelRegion/polyMesh/faceZones | 21 + .../constant/panelRegion/polyMesh/faces | 177240 ++++++++++++++ .../constant/panelRegion/polyMesh/neighbour | 27289 +++ .../constant/panelRegion/polyMesh/owner | 177241 +++++++++++++++ .../polyMesh/pointToPatchPointAddressing | 42925 ++++ .../constant/panelRegion/polyMesh/pointZones | 21 + .../constant/panelRegion/polyMesh/points | 42924 ++++ .../constant/panelRegion/radiationProperties | 26 +- .../panelRegion/thermophysicalProperties | 12 - .../constant/radiationProperties | 8 +- .../constant/radiationProperties | 6 +- .../constant/radiationProperties | 6 +- .../system/changeDictionaryDict.baffleRegion | 6 - .../constant/radiationProperties | 6 +- .../constant/radiationProperties | 6 +- .../constant/heater/radiationProperties | 45 + .../constant/heater/thermophysicalProperties | 21 - .../constant/leftSolid/radiationProperties | 45 + .../leftSolid/thermophysicalProperties | 22 +- .../constant/rightSolid/radiationProperties | 45 + .../rightSolid/thermophysicalProperties | 21 - .../constant/heater/radiationProperties | 45 + .../constant/heater/thermophysicalProperties | 21 - .../constant/leftSolid/radiationProperties | 45 + .../leftSolid/thermophysicalProperties | 21 - .../constant/rightSolid/radiationProperties | 45 + .../rightSolid/thermophysicalProperties | 21 - .../constant/heater/radiationProperties | 45 + .../constant/heater/thermophysicalProperties | 21 - .../constant/leftSolid/radiationProperties | 45 + .../leftSolid/thermophysicalProperties | 21 - .../constant/rightSolid/radiationProperties | 45 + .../rightSolid/thermophysicalProperties | 21 - .../constant/heater/radiationProperties | 45 + .../constant/heater/thermophysicalProperties | 21 - .../constant/leftSolid/radiationProperties | 45 + .../leftSolid/thermophysicalProperties | 21 - .../constant/rightSolid/radiationProperties | 45 + .../rightSolid/thermophysicalProperties | 21 - .../constant/bottomAir/radiationProperties | 6 +- .../constant/heater/radiationProperties | 45 + .../constant/heater/thermophysicalProperties | 21 - .../constant/leftSolid/radiationProperties | 45 + .../leftSolid/thermophysicalProperties | 21 - .../constant/rightSolid/radiationProperties | 45 + .../rightSolid/thermophysicalProperties | 21 - .../constant/topAir/radiationProperties | 6 +- .../system/bottomAir/changeDictionaryDict | 6 +- .../system/topAir/changeDictionaryDict | 6 +- .../constant/radiationProperties | 6 +- .../filter/constant/radiationProperties | 6 +- .../parcelInBox/constant/radiationProperties | 6 +- .../aachenBomb/constant/radiationProperties | 6 +- 73 files changed, 863925 insertions(+), 461 deletions(-) create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/boundary create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/cellToPatchFaceAddressing create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/cellZones create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/faceToPatchEdgeAddressing create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/faceToPatchFaceAddressing create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/faceZones create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/faces create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/neighbour create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/owner create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/pointToPatchPointAddressing create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/pointZones create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/polyMesh/points create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/radiationProperties create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/radiationProperties diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C index 9d9626a32e..c9e20fed75 100644 --- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C +++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C @@ -51,7 +51,8 @@ void noPyrolysis::constructThermoChemistry() solidChemistryModel::New(regionMesh()).ptr() ); - solidThermo_.reset(&solidChemistry_->solid()); + solidThermo_.reset(&solidChemistry_->solidThermo()); + radiation_.reset(radiation::radiationModel::New(solidThermo_->T()).ptr()); } bool noPyrolysis::read() @@ -88,7 +89,8 @@ noPyrolysis::noPyrolysis(const word& modelType, const fvMesh& mesh) : pyrolysisModel(mesh), solidChemistry_(NULL), - solidThermo_(NULL) + solidThermo_(NULL), + radiation_(NULL) { if (active()) { @@ -105,7 +107,8 @@ noPyrolysis::noPyrolysis ): pyrolysisModel(mesh), solidChemistry_(NULL), - solidThermo_(NULL) + solidThermo_(NULL), + radiation_(NULL) { if (active()) { diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H index 808b5d7800..87fbd604c7 100644 --- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H +++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H @@ -38,6 +38,7 @@ SourceFiles #include "pyrolysisModel.H" #include "volFieldsFwd.H" #include "solidChemistryModel.H" +#include "radiationModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -86,6 +87,9 @@ protected: //- Reference to solid thermo autoPtr solidThermo_; + //- Pointer to radiation model + autoPtr radiation_; + public: diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.C b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.C index e050a38871..b64afa0be6 100644 --- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.C +++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.C @@ -78,8 +78,6 @@ void pyrolysisModel::constructMeshObjects() } } - radiation_.reset(radiation::radiationModel::New(T()).ptr()); - if (!foundCoupledPatch) { WarningIn("void pyrolysisModels::constructMeshObjects()") @@ -137,8 +135,7 @@ pyrolysisModel::pyrolysisModel(const fvMesh& mesh) regionModel1D(mesh), filmCoupled_(false), filmDeltaPtr_(NULL), - reactionDeltaMin_(0.0), - radiation_(NULL) + reactionDeltaMin_(0.0) {} @@ -147,8 +144,7 @@ pyrolysisModel::pyrolysisModel(const word& modelType, const fvMesh& mesh) regionModel1D(mesh, "pyrolysis", modelType), filmCoupled_(false), filmDeltaPtr_(NULL), - reactionDeltaMin_(0.0), - radiation_(NULL) + reactionDeltaMin_(0.0) { if (active_) { @@ -168,8 +164,7 @@ pyrolysisModel::pyrolysisModel regionModel1D(mesh, "pyrolysis", modelType, dict), filmCoupled_(false), filmDeltaPtr_(NULL), - reactionDeltaMin_(0.0), - radiation_(NULL) + reactionDeltaMin_(0.0) { if (active_) { diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H index 731bc897bb..57d8caa3c4 100644 --- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H +++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H @@ -38,7 +38,6 @@ SourceFiles #include "runTimeSelectionTables.H" #include "volFieldsFwd.H" #include "regionModel1D.H" -#include "radiationModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -92,9 +91,6 @@ protected: //- Film height below which reactions can occur [m] scalar reactionDeltaMin_; - //- Pointer to radiation model - autoPtr radiation_; - // Protected Member Functions diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C index e833d7459e..948d7f87a0 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C @@ -363,7 +363,8 @@ reactingOneDim::reactingOneDim(const word& modelType, const fvMesh& mesh) : pyrolysisModel(modelType, mesh), solidChemistry_(solidChemistryModel::New(regionMesh())), - solidThermo_(solidChemistry_->solid()), + solidThermo_(solidChemistry_->solidThermo()), + radiation_(radiation::radiationModel::New(solidThermo_.T())), rho_ ( IOobject @@ -474,7 +475,8 @@ reactingOneDim::reactingOneDim : pyrolysisModel(modelType, mesh, dict), solidChemistry_(solidChemistryModel::New(regionMesh())), - solidThermo_(solidChemistry_->solid()), + solidThermo_(solidChemistry_->solidThermo()), + radiation_(radiation::radiationModel::New(solidThermo_.T())), rho_ ( IOobject diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H index 44893570d1..76cf66a60f 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H @@ -37,7 +37,7 @@ SourceFiles #include "pyrolysisModel.H" #include "solidChemistryModel.H" - +#include "radiationModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -81,6 +81,9 @@ protected: //- Reference to solid thermo solidReactionThermo& solidThermo_; + //- Pointer to radiation model + autoPtr radiation_; + // Reference to solid thermo properties diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C index c0685e54f6..bfc266ab73 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C @@ -42,7 +42,7 @@ namespace Foam 2 >::names[] = { - "solidThermo", + "solidRadiation", "lookup" }; } @@ -78,7 +78,7 @@ Foam::radiationCoupledBase::radiationCoupledBase { switch (method_) { - case SOLIDTHERMO: + case SOLIDRADIATION: { if (!isA(patch_.patch())) { @@ -132,7 +132,7 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const { switch (method_) { - case SOLIDTHERMO: + case SOLIDRADIATION: { // Get the coupling information from the mappedPatchBase const mappedPatchBase& mpp = diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H index 01d8e8761c..12d805c078 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H @@ -59,7 +59,7 @@ public: //- Type of supplied emissivity enum emissivityMethodType { - SOLIDTHERMO, + SOLIDRADIATION, LOOKUP }; diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C index 149fb19691..4ef719498f 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C @@ -113,7 +113,7 @@ bool Foam::radiation::radiationModel::read() lookup("radiation") >> radiation_; coeffs_ = subDict(type() + "Coeffs"); - lookup("solverFreq") >> solverFreq_, + lookupOrDefault