From 639c798250b092fba65eb6a849d220200b6c8e13 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Tue, 26 Apr 2016 14:35:01 +0100 Subject: [PATCH 1/4] BUG: boundaryRadiationProperties - updated to use caseConstant() for parallel usage and updated style --- .../boundaryRadiationProperties.C | 57 ++++++++++++------- .../boundaryRadiationProperties.H | 7 +-- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C index 709c03a778..0973c19fd6 100644 --- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C @@ -42,13 +42,14 @@ namespace Foam Foam::IOobject Foam::radiation::boundaryRadiationProperties::createIOobject ( - const fvMesh& mesh, const word name + const fvMesh& mesh, + const word name ) const { IOobject io ( name, - mesh.time().constant(), + mesh.time().caseConstant(), mesh, IOobject::MUST_READ, IOobject::NO_WRITE @@ -71,7 +72,7 @@ Foam::IOobject Foam::radiation::boundaryRadiationProperties::createIOobject Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties ( - const fvMesh& mesh + const fvMesh& mesh ) : MeshObject @@ -99,15 +100,19 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties // * * * * * * * * * * * * * * * Member fucntions * * * * * * * * * * * * * // -const Foam::volScalarField& Foam::radiation::boundaryRadiationProperties:: -radBoundaryProperties() const +const Foam::volScalarField& +Foam::radiation::boundaryRadiationProperties::radBoundaryProperties() const { return radBoundaryProperties_(); } -Foam::tmp Foam::radiation::boundaryRadiationProperties:: -emissivity(const label index, const label bandI) const +Foam::tmp +Foam::radiation::boundaryRadiationProperties::emissivity +( + const label index, + const label bandI +) const { if (!radBoundaryProperties_.empty()) { @@ -120,8 +125,8 @@ emissivity(const label index, const label bandI) const { FatalErrorInFunction << "Field 'boundaryRadiationProperties'" - << "is not found in the constant directory." - << "Please add it " + << "is not found in the constant directory. " + << "Please add it" << exit(FatalError); return tmp(new scalarField()); @@ -129,8 +134,12 @@ emissivity(const label index, const label bandI) const } -Foam::tmp Foam::radiation::boundaryRadiationProperties:: -absorptivity(const label index, const label bandI) const +Foam::tmp +Foam::radiation::boundaryRadiationProperties::absorptivity +( + const label index, + const label bandI +) const { if (!radBoundaryProperties_.empty()) { @@ -143,7 +152,7 @@ absorptivity(const label index, const label bandI) const { FatalErrorInFunction << "Field 'boundaryRadiationProperties'" - << "is not found in the constant directory." + << "is not found in the constant directory. " << "Please add it " << exit(FatalError); @@ -152,8 +161,12 @@ absorptivity(const label index, const label bandI) const } -Foam::tmp Foam::radiation::boundaryRadiationProperties:: -transmissivity(const label index, const label bandI) const +Foam::tmp +Foam::radiation::boundaryRadiationProperties::transmissivity +( + const label index, + const label bandI +) const { if (!radBoundaryProperties_.empty()) { @@ -166,8 +179,8 @@ transmissivity(const label index, const label bandI) const { FatalErrorInFunction << "Field 'boundaryRadiationProperties'" - << "is not found in the constant directory." - << "Please add it " + << "is not found in the constant directory. " + << "Please add it" << exit(FatalError); return tmp(new scalarField()); @@ -175,8 +188,12 @@ transmissivity(const label index, const label bandI) const } -Foam::tmp Foam::radiation::boundaryRadiationProperties:: -reflectivity(const label index, const label bandI) const +Foam::tmp +Foam::radiation::boundaryRadiationProperties::reflectivity +( + const label index, + const label bandI +) const { if (!radBoundaryProperties_.empty()) { @@ -189,8 +206,8 @@ reflectivity(const label index, const label bandI) const { FatalErrorInFunction << "Field 'boundaryRadiationProperties'" - << "is not found in the constant directory." - << "Please add it " + << "is not found in the constant directory. " + << "Please add it" << exit(FatalError); return tmp(new scalarField()); diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H index 0bb1cc4d8d..32b236592d 100644 --- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H @@ -22,12 +22,11 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::boundaryRadiationProperties + Foam::radiation::boundaryRadiationProperties Description Boundary radiation properties holder - SourceFiles boundaryRadiationProperties.C @@ -84,7 +83,7 @@ public: // Constructors - //- Construct given fvMesh and IOobject + //- Construct given fvMesh boundaryRadiationProperties(const fvMesh&); @@ -127,9 +126,9 @@ public: //- Destructor virtual ~boundaryRadiationProperties(); - }; + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace radiation From 51ea7379d6d048d67ee9b754f1a51c2c3a7c413c Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Thu, 28 Apr 2016 17:24:50 +0100 Subject: [PATCH 2/4] STYLE: boundaryRadiationProperties updates --- .../boundaryRadiationProperties.C | 65 +++++-------------- .../boundaryRadiationProperties.H | 20 ++---- 2 files changed, 21 insertions(+), 64 deletions(-) diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C index 0973c19fd6..3ac0961c9c 100644 --- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C @@ -38,36 +38,6 @@ namespace Foam } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -Foam::IOobject Foam::radiation::boundaryRadiationProperties::createIOobject -( - const fvMesh& mesh, - const word name -) const -{ - IOobject io - ( - name, - mesh.time().caseConstant(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ); - - if (io.typeHeaderOk(true)) - { - io.readOpt() = IOobject::MUST_READ_IF_MODIFIED; - return io; - } - else - { - io.readOpt() = IOobject::NO_READ; - return io; - } -} - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties @@ -83,12 +53,16 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties >(mesh), radBoundaryProperties_() { - const IOobject boundaryIO + IOobject boundaryIO ( - createIOobject(mesh, boundaryRadiationProperties::typeName) + boundaryRadiationProperties::typeName, + mesh.time().constant(), + mesh, + IOobject::MUST_READ, + IOobject::NO_WRITE ); - if (boundaryIO.readOpt() == IOobject::MUST_READ_IF_MODIFIED) + if (boundaryIO.typeHeaderOk(true)) { radBoundaryProperties_.set ( @@ -100,17 +74,10 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties // * * * * * * * * * * * * * * * Member fucntions * * * * * * * * * * * * * // -const Foam::volScalarField& -Foam::radiation::boundaryRadiationProperties::radBoundaryProperties() const -{ - return radBoundaryProperties_(); -} - - Foam::tmp Foam::radiation::boundaryRadiationProperties::emissivity ( - const label index, + const label patchI, const label bandI ) const { @@ -118,7 +85,7 @@ Foam::radiation::boundaryRadiationProperties::emissivity { return refCast ( - radBoundaryProperties_->boundaryField()[index] + radBoundaryProperties_->boundaryField()[patchI] ).emissivity(bandI); } else @@ -129,7 +96,7 @@ Foam::radiation::boundaryRadiationProperties::emissivity << "Please add it" << exit(FatalError); - return tmp(new scalarField()); + return tmp(new scalarField()); } } @@ -137,7 +104,7 @@ Foam::radiation::boundaryRadiationProperties::emissivity Foam::tmp Foam::radiation::boundaryRadiationProperties::absorptivity ( - const label index, + const label patchI, const label bandI ) const { @@ -145,7 +112,7 @@ Foam::radiation::boundaryRadiationProperties::absorptivity { return refCast ( - radBoundaryProperties_->boundaryField()[index] + radBoundaryProperties_->boundaryField()[patchI] ).absorptivity(bandI); } else @@ -164,7 +131,7 @@ Foam::radiation::boundaryRadiationProperties::absorptivity Foam::tmp Foam::radiation::boundaryRadiationProperties::transmissivity ( - const label index, + const label patchI, const label bandI ) const { @@ -172,7 +139,7 @@ Foam::radiation::boundaryRadiationProperties::transmissivity { return refCast ( - radBoundaryProperties_->boundaryField()[index] + radBoundaryProperties_->boundaryField()[patchI] ).transmissivity(bandI); } else @@ -191,7 +158,7 @@ Foam::radiation::boundaryRadiationProperties::transmissivity Foam::tmp Foam::radiation::boundaryRadiationProperties::reflectivity ( - const label index, + const label patchI, const label bandI ) const { @@ -199,7 +166,7 @@ Foam::radiation::boundaryRadiationProperties::reflectivity { return refCast ( - radBoundaryProperties_->boundaryField()[index] + radBoundaryProperties_->boundaryField()[patchI] ).reflectivity(bandI); } else diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H index 32b236592d..7fd29d7a17 100644 --- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H @@ -69,12 +69,6 @@ class boundaryRadiationProperties autoPtr radBoundaryProperties_; - // Private member functions - - //- Create IO object if dictionary is present - IOobject createIOobject(const fvMesh& mesh, const word) const; - - public: // Declare name of the class and its debug switch @@ -84,7 +78,7 @@ public: // Constructors //- Construct given fvMesh - boundaryRadiationProperties(const fvMesh&); + explicit boundaryRadiationProperties(const fvMesh&); // Member Functions @@ -92,7 +86,7 @@ public: //- Access boundary emissivity on patch tmp emissivity ( - const label patchId, + const label patchI, const label bandI = 0 ) const; @@ -100,7 +94,7 @@ public: //- Access boundary absorptivity on patch tmp absorptivity ( - const label patchId, + const label patchI, const label bandI = 0 ) const; @@ -108,22 +102,18 @@ public: //- Access boundary transmissivity on patch tmp transmissivity ( - const label patchId, + const label patchI, const label bandI = 0 ) const; //- Access boundary reflectivity on patch tmp reflectivity ( - const label patchId, + const label patchI, const label bandI = 0 ) const; - //- Access to radBoundaryProperties - const volScalarField& radBoundaryProperties() const; - - //- Destructor virtual ~boundaryRadiationProperties(); }; From b7ee80c926a42262549d160d955d6742b31a803b Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 29 Apr 2016 15:51:08 -0700 Subject: [PATCH 3/4] GIT: Resolve conflict when applying Sergio's updates to new local branch --- src/thermophysicalModels/radiation/Make/files | 2 +- .../boundaryRadiationProperties.C | 75 +++---- .../boundaryRadiationProperties.H | 10 +- .../boundaryRadiationPropertiesPatch.C} | 210 ++++++------------ .../boundaryRadiationPropertiesPatch.H} | 80 ++----- .../constant/boundaryRadiationProperties | 32 ++- .../constant/boundaryRadiationProperties | 33 ++- .../constant/boundaryRadiationProperties | 46 ++-- .../fireFoam/les/smallPoolFire3D/Allrun | 2 +- .../constant/boundaryRadiationProperties | 21 +- .../constant/boundaryRadiationProperties | 48 +--- .../constant/boundaryRadiationProperties | 21 +- .../constant/air/boundaryRadiationProperties | 46 ++-- .../bottomAir/boundaryRadiationProperties | 33 ++- .../topAir/boundaryRadiationProperties | 28 +-- .../constant/boundaryRadiationProperties | 27 +-- 16 files changed, 243 insertions(+), 471 deletions(-) rename src/thermophysicalModels/radiation/{derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.C => submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C} (65%) rename src/thermophysicalModels/radiation/{derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.H => submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H} (63%) diff --git a/src/thermophysicalModels/radiation/Make/files b/src/thermophysicalModels/radiation/Make/files index ef6e105719..2e9d71e8fb 100644 --- a/src/thermophysicalModels/radiation/Make/files +++ b/src/thermophysicalModels/radiation/Make/files @@ -29,6 +29,7 @@ submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionE submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C submodels/absorptionEmissionModel/multiBandSolidAbsorptionEmission/multiBandSolidAbsorptionEmission.C submodels/boundaryRadiationProperties/boundaryRadiationProperties.C +submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C /* Soot model */ submodels/sootModel/sootModel/sootModel.C @@ -52,6 +53,5 @@ derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTempe derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C -derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.C LIB = $(FOAM_LIBBIN)/libradiationModels diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C index 3ac0961c9c..76dd3b76b6 100644 --- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C @@ -24,8 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "boundaryRadiationProperties.H" -#include "boundaryRadiationPropertiesFvPatchField.H" -#include "fvPatchField.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -51,7 +49,7 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties Foam::GeometricMeshObject, boundaryRadiationProperties >(mesh), - radBoundaryProperties_() + radBoundaryPropertiesPtrList_(mesh.boundary().size()) { IOobject boundaryIO ( @@ -59,15 +57,28 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties mesh.time().constant(), mesh, IOobject::MUST_READ, - IOobject::NO_WRITE + IOobject::NO_WRITE, + false ); - if (boundaryIO.typeHeaderOk(true)) + if (boundaryIO.typeHeaderOk(true)) { - radBoundaryProperties_.set - ( - new volScalarField(boundaryIO, mesh) - ); + const IOdictionary radiationDict(boundaryIO); + + forAll (mesh.boundary(), patchi) + { + const polyPatch& pp = mesh.boundaryMesh()[patchi]; + + if (radiationDict.isDict(pp.name())) + { + const dictionary& dict = radiationDict.subDict(pp.name()); + + radBoundaryPropertiesPtrList_[patchi].set + ( + new boundaryRadiationPropertiesPatch(pp, dict) + ); + } + } } } @@ -81,18 +92,15 @@ Foam::radiation::boundaryRadiationProperties::emissivity const label bandI ) const { - if (!radBoundaryProperties_.empty()) + if (!radBoundaryPropertiesPtrList_[patchI].empty()) { - return refCast - ( - radBoundaryProperties_->boundaryField()[patchI] - ).emissivity(bandI); + return radBoundaryPropertiesPtrList_[patchI]->emissivity(bandI); } else { FatalErrorInFunction - << "Field 'boundaryRadiationProperties'" - << "is not found in the constant directory. " + << "Patch : " << mesh().boundaryMesh()[patchI].name() + << " is not found in the boundaryRadiationProperties. " << "Please add it" << exit(FatalError); @@ -108,19 +116,16 @@ Foam::radiation::boundaryRadiationProperties::absorptivity const label bandI ) const { - if (!radBoundaryProperties_.empty()) + if (!radBoundaryPropertiesPtrList_[patchI].empty()) { - return refCast - ( - radBoundaryProperties_->boundaryField()[patchI] - ).absorptivity(bandI); + return radBoundaryPropertiesPtrList_[patchI]->absorptivity(bandI); } else { FatalErrorInFunction - << "Field 'boundaryRadiationProperties'" - << "is not found in the constant directory. " - << "Please add it " + << "Patch : " << mesh().boundaryMesh()[patchI].name() + << " is not found in the boundaryRadiationProperties. " + << "Please add it" << exit(FatalError); return tmp(new scalarField()); @@ -135,18 +140,15 @@ Foam::radiation::boundaryRadiationProperties::transmissivity const label bandI ) const { - if (!radBoundaryProperties_.empty()) + if (!radBoundaryPropertiesPtrList_[patchI].empty()) { - return refCast - ( - radBoundaryProperties_->boundaryField()[patchI] - ).transmissivity(bandI); + return radBoundaryPropertiesPtrList_[patchI]->transmissivity(bandI); } else { FatalErrorInFunction - << "Field 'boundaryRadiationProperties'" - << "is not found in the constant directory. " + << "Patch : " << mesh().boundaryMesh()[patchI].name() + << " is not found in the boundaryRadiationProperties. " << "Please add it" << exit(FatalError); @@ -162,18 +164,15 @@ Foam::radiation::boundaryRadiationProperties::reflectivity const label bandI ) const { - if (!radBoundaryProperties_.empty()) + if (!radBoundaryPropertiesPtrList_[patchI].empty()) { - return refCast - ( - radBoundaryProperties_->boundaryField()[patchI] - ).reflectivity(bandI); + return radBoundaryPropertiesPtrList_[patchI]->reflectivity(bandI); } else { FatalErrorInFunction - << "Field 'boundaryRadiationProperties'" - << "is not found in the constant directory. " + << "Patch : " << mesh().boundaryMesh()[patchI].name() + << " is not found in the boundaryRadiationProperties. " << "Please add it" << exit(FatalError); diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H index 7fd29d7a17..e10622f6bb 100644 --- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H @@ -36,8 +36,7 @@ SourceFiles #define boundaryRadiationProperties_H #include "MeshObject.H" -#include "GeometricField.H" -#include "volMesh.H" +#include "boundaryRadiationPropertiesPatch.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -65,8 +64,9 @@ class boundaryRadiationProperties // Private data - //- AutoPtr to volSacalarField properties - autoPtr radBoundaryProperties_; + //- Ptr list of boundaryRadiationProperties + List > + radBoundaryPropertiesPtrList_; public: @@ -115,7 +115,7 @@ public: //- Destructor - virtual ~boundaryRadiationProperties(); + ~boundaryRadiationProperties(); }; diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C similarity index 65% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.C rename to src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C index aa3e086e20..eb27e6bf88 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.C +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C @@ -23,13 +23,10 @@ License \*---------------------------------------------------------------------------*/ -#include "boundaryRadiationPropertiesFvPatchField.H" -#include "volFields.H" +#include "boundaryRadiationPropertiesPatch.H" #include "mappedPatchBase.H" -#include "fvPatchFieldMapper.H" #include "radiationModel.H" #include "absorptionEmissionModel.H" -#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * // @@ -38,7 +35,7 @@ namespace Foam template<> const char* Foam::NamedEnum < - Foam::radiation::boundaryRadiationPropertiesFvPatchField::methodType, + Foam::radiation::boundaryRadiationPropertiesPatch::methodType, 3 >::names[] = { @@ -50,70 +47,53 @@ namespace Foam const Foam::NamedEnum < - Foam::radiation::boundaryRadiationPropertiesFvPatchField::methodType, + Foam::radiation::boundaryRadiationPropertiesPatch::methodType, 3 -> Foam::radiation::boundaryRadiationPropertiesFvPatchField::methodTypeNames_; +> Foam::radiation::boundaryRadiationPropertiesPatch::methodTypeNames_; // * * * * * * * * * * * * * * * * Private functions * * * * * * * * * * * * // Foam::label -Foam::radiation::boundaryRadiationPropertiesFvPatchField::nbrPatchIndex() const +Foam::radiation::boundaryRadiationPropertiesPatch::nbrPatchIndex() const { // Get the coupling information from the mappedPatchBase const mappedPatchBase& mpp = - refCast(patch().patch()); + refCast(patch_); return (mpp.samplePolyPatch().index()); } const Foam::fvMesh& -Foam::radiation::boundaryRadiationPropertiesFvPatchField::nbrRegion() const +Foam::radiation::boundaryRadiationPropertiesPatch::nbrRegion() const { const mappedPatchBase& mpp = - refCast(patch().patch()); + refCast(patch_); return (refCast(mpp.sampleMesh())); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::radiation::boundaryRadiationPropertiesFvPatchField:: -boundaryRadiationPropertiesFvPatchField +Foam::radiation::boundaryRadiationPropertiesPatch:: +boundaryRadiationPropertiesPatch ( - const fvPatch& p, - const DimensionedField& iF -) -: - calculatedFvPatchScalarField(p, iF), - method_(LOOKUP), - dict_(), - absorptionEmission_(NULL), - transmissivity_(NULL) -{} - - -Foam::radiation::boundaryRadiationPropertiesFvPatchField:: -boundaryRadiationPropertiesFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, + const polyPatch& p, const dictionary& dict ) : - calculatedFvPatchScalarField(p, iF), method_(methodTypeNames_.read(dict.lookup("mode"))), dict_(dict), absorptionEmission_(NULL), - transmissivity_(NULL) + transmissivity_(NULL), + patch_(p) { switch (method_) { case SOLIDRADIATION: { - if (!isA(p.patch())) + if (!isA(p)) { FatalErrorInFunction << "\n patch type '" << p.type() @@ -126,23 +106,18 @@ boundaryRadiationPropertiesFvPatchField case MODEL: { - const fvMesh& mesh = this->dimensionedInternalField().mesh(); + const fvMesh& mesh = + refCast(p.boundaryMesh().mesh()); - //if (dict.found("absorptionEmissionModel")) - { - absorptionEmission_.reset - ( - absorptionEmissionModel::New(dict, mesh).ptr() - ); - } + absorptionEmission_.reset + ( + absorptionEmissionModel::New(dict, mesh).ptr() + ); - // if (dict.found("transmissivityModel")) - { - transmissivity_.reset - ( - transmissivityModel::New(dict, mesh).ptr() - ); - } + transmissivity_.reset + ( + transmissivityModel::New(dict, mesh).ptr() + ); } case LOOKUP: { @@ -151,71 +126,19 @@ boundaryRadiationPropertiesFvPatchField break; } - if (dict.found("value")) - { - fvPatchScalarField::operator= - ( - scalarField("value", dict, p.size()) - ); - - } - else - { - fvPatchScalarField::operator=(0.0); - } } +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::radiation::boundaryRadiationPropertiesFvPatchField:: -boundaryRadiationPropertiesFvPatchField -( - const boundaryRadiationPropertiesFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - calculatedFvPatchScalarField(ptf, p, iF, mapper), - method_(ptf.method_), - dict_(ptf.dict_), - absorptionEmission_(NULL), - transmissivity_(NULL) -{} - - -Foam::radiation::boundaryRadiationPropertiesFvPatchField:: -boundaryRadiationPropertiesFvPatchField -( - const boundaryRadiationPropertiesFvPatchField& ptf -) -: - calculatedFvPatchScalarField(ptf), - method_(ptf.method_), - dict_(ptf.dict_), - absorptionEmission_(NULL), - transmissivity_(NULL) -{} - - -Foam::radiation::boundaryRadiationPropertiesFvPatchField:: -boundaryRadiationPropertiesFvPatchField -( - const boundaryRadiationPropertiesFvPatchField& ptf, - const DimensionedField& iF -) -: - calculatedFvPatchScalarField(ptf, iF), - method_(ptf.method_), - dict_(ptf.dict_), - absorptionEmission_(NULL), - transmissivity_(NULL) +Foam::radiation::boundaryRadiationPropertiesPatch:: +~boundaryRadiationPropertiesPatch() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // const Foam::radiation::absorptionEmissionModel& -Foam::radiation::boundaryRadiationPropertiesFvPatchField:: +Foam::radiation::boundaryRadiationPropertiesPatch:: absorptionEmission() const { return absorptionEmission_(); @@ -223,16 +146,17 @@ absorptionEmission() const const Foam::radiation::transmissivityModel& -Foam::radiation::boundaryRadiationPropertiesFvPatchField:: +Foam::radiation::boundaryRadiationPropertiesPatch:: transmissiveModel() const { return transmissivity_(); } - -Foam::tmp Foam::radiation:: -boundaryRadiationPropertiesFvPatchField:: -emissivity(const label bandI) const +Foam::tmp +Foam::radiation::boundaryRadiationPropertiesPatch::emissivity +( + const label bandI +) const { switch (method_) { @@ -255,7 +179,7 @@ emissivity(const label bandI) const ); const mappedPatchBase& mpp = - refCast(patch().patch()); + refCast(patch_); mpp.distribute(emissivity); @@ -270,7 +194,7 @@ emissivity(const label bandI) const { tmp e ( - new scalarField("emissivity", dict_, patch().size()) + new scalarField("emissivity", dict_, patch_.size()) ); return e; @@ -278,7 +202,7 @@ emissivity(const label bandI) const case MODEL: { - const label index = patch().index(); + const label index = patch_.index(); tmp e ( @@ -304,8 +228,8 @@ emissivity(const label bandI) const } -Foam::tmp Foam::radiation:: -boundaryRadiationPropertiesFvPatchField::absorptivity +Foam::tmp +Foam::radiation::boundaryRadiationPropertiesPatch::absorptivity ( const label bandI ) const @@ -331,7 +255,7 @@ boundaryRadiationPropertiesFvPatchField::absorptivity ); const mappedPatchBase& mpp = - refCast(patch().patch()); + refCast(patch_); mpp.distribute(absorp); @@ -344,7 +268,7 @@ boundaryRadiationPropertiesFvPatchField::absorptivity case MODEL: { - const label index = patch().index(); + const label index = patch_.index(); tmp a ( new scalarField @@ -359,7 +283,7 @@ boundaryRadiationPropertiesFvPatchField::absorptivity { tmp a ( - new scalarField("absorptivity", dict_, patch().size()) + new scalarField("absorptivity", dict_, patch_.size()) ); return a; @@ -380,9 +304,11 @@ boundaryRadiationPropertiesFvPatchField::absorptivity } -Foam::tmp Foam::radiation:: -boundaryRadiationPropertiesFvPatchField:: -transmissivity(const label bandI) const +Foam::tmp +Foam::radiation::boundaryRadiationPropertiesPatch::transmissivity +( + const label bandI +) const { switch (method_) { @@ -405,7 +331,7 @@ transmissivity(const label bandI) const ); const mappedPatchBase& mpp = - refCast(patch().patch()); + refCast(patch_); mpp.distribute(trans); @@ -418,7 +344,7 @@ transmissivity(const label bandI) const case MODEL: { - const label index = patch().index(); + const label index = patch_.index(); tmp tau ( new scalarField @@ -435,7 +361,7 @@ transmissivity(const label bandI) const ( new scalarField ( - "transmissivity", dict_, patch().size() + "transmissivity", dict_, patch_.size() ) ); return tau; @@ -457,9 +383,11 @@ transmissivity(const label bandI) const -Foam::tmp Foam::radiation:: -boundaryRadiationPropertiesFvPatchField:: -reflectivity(const label bandI) const +Foam::tmp +Foam::radiation::boundaryRadiationPropertiesPatch::reflectivity +( + const label bandI +) const { const tmp tt = transmissivity(bandI); const tmp ta = absorptivity(bandI); @@ -468,11 +396,11 @@ reflectivity(const label bandI) const } -void Foam::radiation::boundaryRadiationPropertiesFvPatchField:: -write(Ostream& os) const +void Foam::radiation::boundaryRadiationPropertiesPatch::write +( + Ostream& os +) const { - calculatedFvPatchScalarField::write(os); - os.writeKeyword("mode") << methodTypeNames_[method_] << token::END_STATEMENT << nl; @@ -509,18 +437,18 @@ write(Ostream& os) const case LOOKUP: { - const scalarField emissivity("emissivity", dict_, patch().size()); + const scalarField emissivity("emissivity", dict_, patch_.size()); emissivity.writeEntry("emissivity", os); const scalarField absorptivity ( - "absorptivity", dict_, patch().size() + "absorptivity", dict_, patch_.size() ); absorptivity.writeEntry("absorptivity", os); const scalarField transmissivity ( - "transmissivity", dict_, patch().size() + "transmissivity", dict_, patch_.size() ); transmissivity.writeEntry("transmissivity", os); @@ -534,18 +462,4 @@ write(Ostream& os) const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace radiation -{ - makePatchTypeField - ( - fvPatchScalarField, - boundaryRadiationPropertiesFvPatchField - ); -} -} - // ************************************************************************* // diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.H b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H similarity index 63% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.H rename to src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H index e6cf0ac502..a78b940bfe 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.H +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::boundaryRadiationPropertiesFvPatchField + Foam::boundaryRadiationPropertiesPatch Description Common functions to emissivity. It gets supplied from lookup into a @@ -33,12 +33,12 @@ Description - 'model' : use a model SourceFiles - boundaryRadiationPropertiesFvPatchField.C + boundaryRadiationPropertiesPatch.C \*---------------------------------------------------------------------------*/ -#ifndef boundaryRadiationPropertiesFvPatchField_H -#define boundaryRadiationPropertiesFvPatchField_H +#ifndef boundaryRadiationPropertiesPatch_H +#define boundaryRadiationPropertiesPatch_H #include "scalarField.H" #include "NamedEnum.H" @@ -54,16 +54,14 @@ namespace Foam namespace radiation { /*---------------------------------------------------------------------------*\ - Class boundaryRadiationPropertiesFvPatchField Declaration + Class boundaryRadiationPropertiesPatch Declaration \*---------------------------------------------------------------------------*/ -class boundaryRadiationPropertiesFvPatchField -: - public calculatedFvPatchScalarField +class boundaryRadiationPropertiesPatch { public: - // - Type of look up + // - Type of method enum methodType { SOLIDRADIATION, @@ -90,6 +88,9 @@ private: //- transmissivity model autoPtr transmissivity_; + //- reference to fvPatch + const polyPatch& patch_; + // Private functions @@ -102,70 +103,19 @@ private: public: - //- Runtime type information - TypeName("boundaryRadiation"); // Constructors - //- Construct from patch and internal field - boundaryRadiationPropertiesFvPatchField - ( - const fvPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary - boundaryRadiationPropertiesFvPatchField + boundaryRadiationPropertiesPatch ( - const fvPatch&, - const DimensionedField&, + const polyPatch&, const dictionary& ); - //- Construct by mapping given a - // greyDiffusiveViewFactorFixedValueFvPatchScalarField onto a new patch - boundaryRadiationPropertiesFvPatchField - ( - const boundaryRadiationPropertiesFvPatchField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Construct as copy - boundaryRadiationPropertiesFvPatchField - ( - const boundaryRadiationPropertiesFvPatchField& - ); - - //- Construct as copy setting internal field reference - boundaryRadiationPropertiesFvPatchField - ( - const boundaryRadiationPropertiesFvPatchField&, - const DimensionedField& - ); - - //- Construct and return a clone - virtual tmp clone() const - { - return tmp - ( - new boundaryRadiationPropertiesFvPatchField(*this) - ); - } - - //- Construct and return a clone setting internal field reference - virtual tmp clone - ( - const DimensionedField& iF - ) const - { - return tmp - ( - new boundaryRadiationPropertiesFvPatchField(*this, iF) - ); - } + //- Destructor + virtual ~boundaryRadiationPropertiesPatch(); // Member functions @@ -196,7 +146,7 @@ public: tmp reflectivity(const label bandI = 0) const; //- Write - virtual void write(Ostream&) const; + void write(Ostream&) const; }; diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties index 282703be6c..8fdbaa838c 100644 --- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties @@ -9,31 +9,25 @@ FoamFile { version 2.0; format ascii; - class volScalarField; + class dictionary; + location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; -internalField uniform 0; - -boundaryField +region0_to_pyrolysisRegion_coupledWall { - region0_to_pyrolysisRegion_coupledWall - { - type boundaryRadiation; - mode solidRadiation; - } - - ".*" - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; - transmissivity uniform 0.0; - } + mode solidRadiation; } +".*" +{ + mode lookup; + emissivity uniform 1.0; + absorptivity uniform 1.0; + transmissivity uniform 0.0; +} + + // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties index 8ab0aff52c..1ea3e10732 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties @@ -9,30 +9,27 @@ FoamFile { version 2.0; format ascii; - class volScalarField; + class dictionary; + location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; -internalField uniform 0; - -boundaryField +".*" { - ".*" - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - value uniform 0; - } - "(region0_to.*)" - { - type boundaryRadiation; - mode solidRadiation; - value uniform 0; - } + type boundaryRadiation; + mode lookup; + emissivity uniform 1.0; + value uniform 0; } +"(region0_to.*)" +{ + type boundaryRadiation; + mode solidRadiation; + value uniform 0; +} + + // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties index e116690736..24c5356cd8 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties @@ -9,29 +9,39 @@ FoamFile { version 2.0; format ascii; - class volScalarField; + class dictionary; + location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField +base { - ".*" - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - value uniform 0; - } - - frontAndBack - { - type empty; - } + mode lookup; + emissivity uniform 1.0; + value uniform 0; } +outlet +{ + mode lookup; + emissivity uniform 1.0; + value uniform 0; +} + +sides +{ + mode lookup; + emissivity uniform 1.0; + value uniform 0; +} + +inlet +{ + mode lookup; + emissivity uniform 1.0; + value uniform 0; +} + + // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun index 7d2349761d..81460ea389 100755 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun @@ -9,7 +9,7 @@ application=`getApplication` runApplication blockMesh runApplication topoSet runApplication createPatch -overwrite -runApplication decomposePar -force -constant +runApplication decomposePar -force # Run runParallel $application diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties index 20a028ae66..08eb48ed27 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties @@ -9,25 +9,18 @@ FoamFile { version 2.0; format ascii; - class volScalarField; + class dictionary; + location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField +".*" { - ".*" - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - absorptivity uniform 0.0; - value uniform 0.0; - } + mode lookup; + emissivity uniform 1.0; + absorptivity uniform 0.0; } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties index 413800d2eb..446f19f45a 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties @@ -9,52 +9,18 @@ FoamFile { version 2.0; format ascii; - class volScalarField; + class dictionary; + location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField +".*" { - box - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; - value uniform 0; - } - - floor - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; - value uniform 0; - } - - ceiling - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; - value uniform 0; - } - - fixedWalls - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; - value uniform 0; - } + mode lookup; + emissivity uniform 1.0; + absorptivity uniform 1.0; } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties index 97ec41d132..446f19f45a 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties @@ -9,25 +9,18 @@ FoamFile { version 2.0; format ascii; - class volScalarField; + class dictionary; + location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField +".*" { - ".*" - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; - value uniform 0.0; - } + mode lookup; + emissivity uniform 1.0; + absorptivity uniform 1.0; } + // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/boundaryRadiationProperties index 7146b2a8c8..eb8b81dd6f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/boundaryRadiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/boundaryRadiationProperties @@ -9,42 +9,30 @@ FoamFile { version 2.0; format ascii; - class volScalarField; + class dictionary; + location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField +".*" { - ".*" - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - absorptivity uniform 0.0; - transmissivity uniform 1.0; + mode lookup; + emissivity uniform 1.0; + absorptivity uniform 0.0; + transmissivity uniform 1.0; +} - value uniform 0.0; - } - - air_to_solid - { - type boundaryRadiation; - mode solidRadiation; - value uniform 0; - } - - air_to_floor - { - type boundaryRadiation; - mode solidRadiation; - value uniform 0; - } +air_to_solid +{ + mode solidRadiation; + value uniform 0; +} +air_to_floor +{ + mode solidRadiation; + value uniform 0; } // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties index 4648cebcef..35e642154a 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties @@ -9,32 +9,25 @@ FoamFile { version 2.0; format ascii; - class volScalarField; + class dictionary; + location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; -internalField uniform 0; - -boundaryField +".*" { - ".*" - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; - value uniform 0; // Dummy value - } - - "bottomAir_to_.*" - { - type boundaryRadiation; - mode solidRadiation; - value uniform 0; // Dummy value - } + mode lookup; + emissivity uniform 1.0; + absorptivity uniform 1.0; } +"bottomAir_to_.*" +{ + type boundaryRadiation; + mode solidRadiation; +} + + // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties index e01fb7a956..d544aba468 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties @@ -9,31 +9,21 @@ FoamFile { version 2.0; format ascii; - class volScalarField; + class dictionary; + location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField +".*" { - ".*" - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - value uniform 0; // Dummy value - } + mode lookup; + emissivity uniform 1.0; +} - "topAir_to_.*" - { - type boundaryRadiation; - mode solidRadiation; - value uniform 0; // Dummy value - } +"topAir_to_.*" +{ + mode solidRadiation; } // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties index 8edfb36ccd..79e2200921 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties @@ -9,33 +9,18 @@ FoamFile { version 2.0; format ascii; - class volScalarField; + class dictionary; + location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; -internalField uniform 0; - -boundaryField +".*" { - ".*" - { - type boundaryRadiation; - mode lookup; - emissivity uniform 1.0; - absorptivity uniform 0.0; - value uniform 0.0; - } - symmetry - { - type symmetryPlane; - } - frontAndBack - { - type empty; - } + mode lookup; + emissivity uniform 1.0; + absorptivity uniform 0.0; } // ************************************************************************* // From c9e872b3bc8991b9bd55a00143db933cfd6ef40b Mon Sep 17 00:00:00 2001 From: sergio Date: Tue, 31 May 2016 08:42:07 -0700 Subject: [PATCH 4/4] ENH: Changing boundaryRadiationProperties to read an scalar when a lookup mode is used for boudanry radiation properties. Tutorials updated accordingly --- .../meshRefinement/meshRefinementTemplates.C | 2 +- src/sampling/meshToMesh/meshToMeshTemplates.C | 2 +- .../boundaryRadiationPropertiesPatch.C | 16 +++++++++++++--- .../constant/boundaryRadiationProperties | 6 +++--- .../constant/boundaryRadiationProperties | 4 +--- .../constant/boundaryRadiationProperties | 12 ++++-------- .../constant/boundaryRadiationProperties | 4 ++-- .../constant/boundaryRadiationProperties | 4 ++-- .../constant/boundaryRadiationProperties | 4 ++-- .../bottomAir/boundaryRadiationProperties | 4 ++-- .../constant/topAir/boundaryRadiationProperties | 2 +- .../constant/boundaryRadiationProperties | 4 ++-- 12 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C index 2eb6e8e92b..a6f0414d1f 100644 --- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C +++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C @@ -305,7 +305,7 @@ void Foam::meshRefinement::weightedSum } sum.setSize(meshPoints.size()); - sum = Type(zero); + sum = Type(Zero); forAll(edges, edgeI) { diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C index 5b2ba58060..56dd95d341 100644 --- a/src/sampling/meshToMesh/meshToMeshTemplates.C +++ b/src/sampling/meshToMesh/meshToMeshTemplates.C @@ -771,7 +771,7 @@ void Foam::meshToMesh::mapAndOpTgtToSrc const CombineOp& cop ) const { - srcField = Type(Tero); + srcField = Type(Zero); AMI.interpolateToSource ( diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C index eb27e6bf88..12c6a4fbf4 100644 --- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C @@ -194,7 +194,11 @@ Foam::radiation::boundaryRadiationPropertiesPatch::emissivity { tmp e ( - new scalarField("emissivity", dict_, patch_.size()) + new scalarField + ( + patch_.size(), + readScalar(dict_.lookup("emissivity")) + ) ); return e; @@ -283,7 +287,11 @@ Foam::radiation::boundaryRadiationPropertiesPatch::absorptivity { tmp a ( - new scalarField("absorptivity", dict_, patch_.size()) + new scalarField + ( + patch_.size(), + readScalar(dict_.lookup("absorptivity")) + ) ); return a; @@ -361,9 +369,11 @@ Foam::radiation::boundaryRadiationPropertiesPatch::transmissivity ( new scalarField ( - "transmissivity", dict_, patch_.size() + patch_.size(), + readScalar(dict_.lookup("transmissivity")) ) ); + return tau; } diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties index 8fdbaa838c..530a06e550 100644 --- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties @@ -24,9 +24,9 @@ region0_to_pyrolysisRegion_coupledWall ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; - transmissivity uniform 0.0; + emissivity 1.0; + absorptivity 1.0; + transmissivity 0.0; } diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties index 1ea3e10732..d3a530f353 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties @@ -20,15 +20,13 @@ FoamFile { type boundaryRadiation; mode lookup; - emissivity uniform 1.0; - value uniform 0; + emissivity 1.0; } "(region0_to.*)" { type boundaryRadiation; mode solidRadiation; - value uniform 0; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties index 24c5356cd8..a4660c95b7 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties @@ -18,29 +18,25 @@ FoamFile base { mode lookup; - emissivity uniform 1.0; - value uniform 0; + emissivity 1.0; } outlet { mode lookup; - emissivity uniform 1.0; - value uniform 0; + emissivity 1.0; } sides { mode lookup; - emissivity uniform 1.0; - value uniform 0; + emissivity 1.0; } inlet { mode lookup; - emissivity uniform 1.0; - value uniform 0; + emissivity 1.0; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties index 08eb48ed27..474446378f 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties @@ -18,8 +18,8 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 0.0; + emissivity 1.0; + absorptivity 0.0; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties index 446f19f45a..c8a183a959 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties @@ -18,8 +18,8 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; + emissivity 1.0; + absorptivity 1.0; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties index 446f19f45a..c8a183a959 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties @@ -18,8 +18,8 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; + emissivity 1.0; + absorptivity 1.0; } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties index 35e642154a..d088ebb1af 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties @@ -19,8 +19,8 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; + emissivity 1.0; + absorptivity 1.0; } "bottomAir_to_.*" diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties index d544aba468..8efbfedb84 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties @@ -18,7 +18,7 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; + emissivity 1.0; } "topAir_to_.*" diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties index 79e2200921..8b57be670c 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties @@ -19,8 +19,8 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 0.0; + emissivity 1.0; + absorptivity 0.0; } // ************************************************************************* //