From b7ee80c926a42262549d160d955d6742b31a803b Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 29 Apr 2016 15:51:08 -0700 Subject: [PATCH] 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; } // ************************************************************************* //