GIT: Resolve conflict when applying Sergio's updates to new local branch

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

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,17 +57,30 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties
         mesh.time().constant(),
         mesh,
         IOobject::MUST_READ,
-        IOobject::NO_WRITE
+        IOobject::NO_WRITE,
+        false
     );
 
-    if (boundaryIO.typeHeaderOk<volScalarField>(true))
+    if (boundaryIO.typeHeaderOk<IOdictionary>(true))
     {
-        radBoundaryProperties_.set
+        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 volScalarField(boundaryIO, mesh)
+                    new boundaryRadiationPropertiesPatch(pp, dict)
                 );
             }
         }
+    }
+}
 
 
 // * * * * * * * * * * * * * * * Member fucntions * * * * * * * * * * * * *  //
@@ -81,18 +92,15 @@ Foam::radiation::boundaryRadiationProperties::emissivity
     const label bandI
 ) const
 {
-    if (!radBoundaryProperties_.empty())
+    if (!radBoundaryPropertiesPtrList_[patchI].empty())
     {
-        return refCast<const boundaryRadiationPropertiesFvPatchField>
+        return radBoundaryPropertiesPtrList_[patchI]->emissivity(bandI);
-        (
-            radBoundaryProperties_->boundaryField()[patchI]
-        ).emissivity(bandI);
     }
     else
     {
         FatalErrorInFunction
-            << "Field 'boundaryRadiationProperties'"
+            << "Patch : " << mesh().boundaryMesh()[patchI].name()
-            << "is not found in the constant directory. "
+            << " is not found in the boundaryRadiationProperties. "
             << "Please add it"
             << exit(FatalError);
 
@@ -108,18 +116,15 @@ Foam::radiation::boundaryRadiationProperties::absorptivity
     const label bandI
 ) const
 {
-    if (!radBoundaryProperties_.empty())
+    if (!radBoundaryPropertiesPtrList_[patchI].empty())
     {
-        return refCast<const boundaryRadiationPropertiesFvPatchField>
+        return radBoundaryPropertiesPtrList_[patchI]->absorptivity(bandI);
-        (
-            radBoundaryProperties_->boundaryField()[patchI]
-        ).absorptivity(bandI);
     }
     else
     {
         FatalErrorInFunction
-            << "Field 'boundaryRadiationProperties'"
+            << "Patch : " << mesh().boundaryMesh()[patchI].name()
-            << "is not found in the constant directory. "
+            << " is not found in the boundaryRadiationProperties. "
             << "Please add it"
             << exit(FatalError);
 
@@ -135,18 +140,15 @@ Foam::radiation::boundaryRadiationProperties::transmissivity
     const label bandI
 ) const
 {
-    if (!radBoundaryProperties_.empty())
+    if (!radBoundaryPropertiesPtrList_[patchI].empty())
     {
-        return refCast<const boundaryRadiationPropertiesFvPatchField>
+        return radBoundaryPropertiesPtrList_[patchI]->transmissivity(bandI);
-        (
-            radBoundaryProperties_->boundaryField()[patchI]
-        ).transmissivity(bandI);
     }
     else
     {
         FatalErrorInFunction
-            << "Field 'boundaryRadiationProperties'"
+            << "Patch : " << mesh().boundaryMesh()[patchI].name()
-            << "is not found in the constant directory. "
+            << " 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<const boundaryRadiationPropertiesFvPatchField>
+        return radBoundaryPropertiesPtrList_[patchI]->reflectivity(bandI);
-        (
-            radBoundaryProperties_->boundaryField()[patchI]
-        ).reflectivity(bandI);
     }
     else
     {
         FatalErrorInFunction
-            << "Field 'boundaryRadiationProperties'"
+            << "Patch : " << mesh().boundaryMesh()[patchI].name()
-            << "is not found in the constant directory. "
+            << " is not found in the boundaryRadiationProperties. "
             << "Please add it"
             << exit(FatalError);
 

src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H

@@ -36,8 +36,7 @@ SourceFiles
 #define boundaryRadiationProperties_H
 
 #include "MeshObject.H"
-#include "GeometricField.H"
+#include "boundaryRadiationPropertiesPatch.H"
-#include "volMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,8 +64,9 @@ class boundaryRadiationProperties
 
     // Private data
 
-        //- AutoPtr to volSacalarField properties
+        //- Ptr list of boundaryRadiationProperties
-        autoPtr<volScalarField> radBoundaryProperties_;
+        List<autoPtr<boundaryRadiationPropertiesPatch> >
+            radBoundaryPropertiesPtrList_;
 
 
 public:
@@ -115,7 +115,7 @@ public:
 
 
     //- Destructor
-    virtual ~boundaryRadiationProperties();
+    ~boundaryRadiationProperties();
 };
 
 

src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C

@@ -23,13 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "boundaryRadiationPropertiesFvPatchField.H"
+#include "boundaryRadiationPropertiesPatch.H"
-#include "volFields.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<const mappedPatchBase>(patch().patch());
+        refCast<const mappedPatchBase>(patch_);
 
     return (mpp.samplePolyPatch().index());
 }
 
 
 const Foam::fvMesh&
-Foam::radiation::boundaryRadiationPropertiesFvPatchField::nbrRegion() const
+Foam::radiation::boundaryRadiationPropertiesPatch::nbrRegion() const
 {
     const mappedPatchBase& mpp =
-        refCast<const mappedPatchBase>(patch().patch());
+        refCast<const mappedPatchBase>(patch_);
 
      return (refCast<const fvMesh>(mpp.sampleMesh()));
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-
+Foam::radiation::boundaryRadiationPropertiesPatch::
-Foam::radiation::boundaryRadiationPropertiesFvPatchField::
+boundaryRadiationPropertiesPatch
-boundaryRadiationPropertiesFvPatchField
 (
-    const fvPatch& p,
+    const polyPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    calculatedFvPatchScalarField(p, iF),
-    method_(LOOKUP),
-    dict_(),
-    absorptionEmission_(NULL),
-    transmissivity_(NULL)
-{}
-
-
-Foam::radiation::boundaryRadiationPropertiesFvPatchField::
-boundaryRadiationPropertiesFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
     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<mappedPatchBase>(p.patch()))
+            if (!isA<mappedPatchBase>(p))
             {
                 FatalErrorInFunction
                     << "\n    patch type '" << p.type()
@@ -126,24 +106,19 @@ boundaryRadiationPropertiesFvPatchField
 
         case MODEL:
         {
-            const fvMesh& mesh = this->dimensionedInternalField().mesh();
+            const fvMesh& mesh =
+                refCast<const fvMesh>(p.boundaryMesh().mesh());
 
-            //if (dict.found("absorptionEmissionModel"))
-            {
             absorptionEmission_.reset
             (
                 absorptionEmissionModel::New(dict, mesh).ptr()
             );
-            }
 
-           // if (dict.found("transmissivityModel"))
-            {
             transmissivity_.reset
             (
                 transmissivityModel::New(dict, mesh).ptr()
             );
         }
-        }
         case LOOKUP:
         {
             //Do nothing
@@ -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::
+Foam::radiation::boundaryRadiationPropertiesPatch::
-boundaryRadiationPropertiesFvPatchField
+~boundaryRadiationPropertiesPatch()
-(
-    const boundaryRadiationPropertiesFvPatchField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& 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<scalar, volMesh>& iF
-)
-:
-    calculatedFvPatchScalarField(ptf, iF),
-    method_(ptf.method_),
-    dict_(ptf.dict_),
-    absorptionEmission_(NULL),
-    transmissivity_(NULL)
 {}
 
 
 // * * * * * * * * * * * * * * * 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::scalarField>
-Foam::tmp<Foam::scalarField> Foam::radiation::
+Foam::radiation::boundaryRadiationPropertiesPatch::emissivity
-boundaryRadiationPropertiesFvPatchField::
+(
-emissivity(const label bandI) const
+    const label bandI
+) const
 {
     switch (method_)
     {
@@ -255,7 +179,7 @@ emissivity(const label bandI) const
             );
 
             const mappedPatchBase& mpp =
-                refCast<const mappedPatchBase>(patch().patch());
+                refCast<const mappedPatchBase>(patch_);
 
             mpp.distribute(emissivity);
 
@@ -270,7 +194,7 @@ emissivity(const label bandI) const
         {
             tmp<scalarField> 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<scalarField> e
             (
@@ -304,8 +228,8 @@ emissivity(const label bandI) const
 }
 
 
-Foam::tmp<Foam::scalarField> Foam::radiation::
+Foam::tmp<Foam::scalarField>
-boundaryRadiationPropertiesFvPatchField::absorptivity
+Foam::radiation::boundaryRadiationPropertiesPatch::absorptivity
 (
     const label bandI
 ) const
@@ -331,7 +255,7 @@ boundaryRadiationPropertiesFvPatchField::absorptivity
             );
 
             const mappedPatchBase& mpp =
-                refCast<const mappedPatchBase>(patch().patch());
+                refCast<const mappedPatchBase>(patch_);
 
             mpp.distribute(absorp);
 
@@ -344,7 +268,7 @@ boundaryRadiationPropertiesFvPatchField::absorptivity
 
         case MODEL:
         {
-            const label index = patch().index();
+            const label index = patch_.index();
             tmp<scalarField> a
             (
                  new scalarField
@@ -359,7 +283,7 @@ boundaryRadiationPropertiesFvPatchField::absorptivity
         {
             tmp<scalarField> a
             (
-                 new scalarField("absorptivity", dict_, patch().size())
+                 new scalarField("absorptivity", dict_, patch_.size())
             );
 
             return a;
@@ -380,9 +304,11 @@ boundaryRadiationPropertiesFvPatchField::absorptivity
 }
 
 
-Foam::tmp<Foam::scalarField> Foam::radiation::
+Foam::tmp<Foam::scalarField>
-boundaryRadiationPropertiesFvPatchField::
+Foam::radiation::boundaryRadiationPropertiesPatch::transmissivity
-transmissivity(const label bandI) const
+(
+    const label bandI
+) const
 {
     switch (method_)
     {
@@ -405,7 +331,7 @@ transmissivity(const label bandI) const
             );
 
             const mappedPatchBase& mpp =
-                refCast<const mappedPatchBase>(patch().patch());
+                refCast<const mappedPatchBase>(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<scalarField> 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::scalarField> Foam::radiation::
+Foam::tmp<Foam::scalarField>
-boundaryRadiationPropertiesFvPatchField::
+Foam::radiation::boundaryRadiationPropertiesPatch::reflectivity
-reflectivity(const label bandI) const
+(
+    const label bandI
+) const
 {
     const tmp<scalarField> tt = transmissivity(bandI);
     const tmp<scalarField> ta = absorptivity(bandI);
@@ -468,11 +396,11 @@ reflectivity(const label bandI) const
 }
 
 
-void Foam::radiation::boundaryRadiationPropertiesFvPatchField::
+void Foam::radiation::boundaryRadiationPropertiesPatch::write
-write(Ostream& os) const
+(
+    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
-    );
-}
-}
-
 // ************************************************************************* //

src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 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
+#ifndef boundaryRadiationPropertiesPatch_H
-#define boundaryRadiationPropertiesFvPatchField_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
+class boundaryRadiationPropertiesPatch
-:
-    public calculatedFvPatchScalarField
 {
 public:
 
-    // - Type of look up
+    // - Type of method
     enum methodType
     {
         SOLIDRADIATION,
@@ -90,6 +88,9 @@ private:
         //- transmissivity model
         autoPtr<transmissivityModel> 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<scalar, volMesh>&
-        );
-
         //- Construct from patch, internal field and dictionary
-        boundaryRadiationPropertiesFvPatchField
+        boundaryRadiationPropertiesPatch
         (
-            const fvPatch&,
+            const polyPatch&,
-            const DimensionedField<scalar, volMesh>&,
             const dictionary&
         );
 
-        //- Construct by mapping given a
+         //- Destructor
-        // greyDiffusiveViewFactorFixedValueFvPatchScalarField onto a new patch
+        virtual ~boundaryRadiationPropertiesPatch();
-        boundaryRadiationPropertiesFvPatchField
-        (
-            const boundaryRadiationPropertiesFvPatchField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        boundaryRadiationPropertiesFvPatchField
-        (
-            const boundaryRadiationPropertiesFvPatchField&
-        );
-
-        //- Construct as copy setting internal field reference
-        boundaryRadiationPropertiesFvPatchField
-        (
-            const boundaryRadiationPropertiesFvPatchField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new boundaryRadiationPropertiesFvPatchField(*this)
-            );
-        }
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new boundaryRadiationPropertiesFvPatchField(*this, iF)
-            );
-        }
 
 
     // Member functions
@@ -196,7 +146,7 @@ public:
         tmp<scalarField> reflectivity(const label bandI = 0) const;
 
         //- Write
-        virtual void write(Ostream&) const;
+        void write(Ostream&) const;
 };
 
 

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
 {
-        type            boundaryRadiation;
     mode            solidRadiation;
 }
 
 ".*"
 {
-        type            boundaryRadiation;
     mode            lookup;
     emissivity      uniform 1.0;
     absorptivity    uniform 1.0;
     transmissivity  uniform 0.0;
 }
-}
+
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties

@@ -9,17 +9,13 @@ 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;
@@ -27,12 +23,13 @@ boundaryField
     emissivity      uniform 1.0;
     value           uniform 0;
 }
+
 "(region0_to.*)"
 {
     type            boundaryRadiation;
     mode            solidRadiation;
     value           uniform 0;
 }
-}
+
 
 // ************************************************************************* //

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];
+base
-
-internalField   uniform 0;
-
-boundaryField
 {
-     ".*"
-    {
-        type            boundaryRadiation;
     mode            lookup;
     emissivity      uniform 1.0;
     value           uniform 0;
 }
 
-    frontAndBack
+outlet
 {
-        type            empty;
+    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;
+}
+
+
 // ************************************************************************* //

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

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;
-    }
 }
 
+
 // ************************************************************************* //

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;
-    }
-}
 
 // ************************************************************************* //

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;
-    }
 }
 
+
 // ************************************************************************* //

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;
-
-        value           uniform 0.0;
 }
 
 air_to_solid
 {
-        type            boundaryRadiation;
     mode            solidRadiation;
     value           uniform 0;
 }
 
 air_to_floor
 {
-        type            boundaryRadiation;
     mode            solidRadiation;
     value           uniform 0;
 }
 
-}
-
 // ************************************************************************* //

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
-    }
 }
 
+
 // ************************************************************************* //

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
 }
 
 "topAir_to_.*"
 {
-        type            boundaryRadiation;
     mode            solidRadiation;
-        value           uniform 0; // Dummy value
-    }
 }
 
 // ************************************************************************* //

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;
-    }
 }
 
 // ************************************************************************* //