Solving problem with sampledSurfaces

Removing specieSolid specialization
Updating tutorials using solidThermo and solid reactions

src/regionModels/pyrolysisModels/Make/options

@@ -3,7 +3,6 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solid/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
@@ -21,9 +20,9 @@ LIB_LIBS = \
     -lmeshTools \
     -lchemistryModel \
     -lspecie \
-    -lsolidSpecie \
     -lfluidThermophysicalModels \
     -lsolidChemistryModel \
+    -lsolidThermo \
     -lcompressibleTurbulenceModel \
     -lcompressibleRASModels \
     -lcompressibleLESModels \

src/regionModels/thermoBaffleModels/Make/options

@@ -17,5 +17,4 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lOpenFOAM \
-    -lsolidSpecie \
     -lradiationModels

src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C

@@ -164,17 +164,19 @@ void Foam::sampledSurfaces::write()
             writeGeometry();
         }
 
-        sampleAndWrite<volScalarField>(mesh_);
+        const IOobjectList objects(mesh_, mesh_.time().timeName());
-        sampleAndWrite<volVectorField>(mesh_);
-        sampleAndWrite<volSphericalTensorField>(mesh_);
-        sampleAndWrite<volSymmTensorField>(mesh_);
-        sampleAndWrite<volTensorField>(mesh_);
 
-        sampleAndWrite<surfaceScalarField>(mesh_);
+        sampleAndWrite<volScalarField>(objects);
-        sampleAndWrite<surfaceVectorField>(mesh_);
+        sampleAndWrite<volVectorField>(objects);
-        sampleAndWrite<surfaceSphericalTensorField>(mesh_);
+        sampleAndWrite<volSphericalTensorField>(objects);
-        sampleAndWrite<surfaceSymmTensorField>(mesh_);
+        sampleAndWrite<volSymmTensorField>(objects);
-        sampleAndWrite<surfaceTensorField>(mesh_);
+        sampleAndWrite<volTensorField>(objects);
+
+        sampleAndWrite<surfaceScalarField>(objects);
+        sampleAndWrite<surfaceVectorField>(objects);
+        sampleAndWrite<surfaceSphericalTensorField>(objects);
+        sampleAndWrite<surfaceSymmTensorField>(objects);
+        sampleAndWrite<surfaceTensorField>(objects);
     }
 }
 

src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H

@@ -160,7 +160,7 @@ class sampledSurfaces
 
         //- Sample and write all sampled fields
         template<class Type>
-        void sampleAndWrite(const fvMesh&);
+        void sampleAndWrite(const IOobjectList&);
 
         //- Disallow default bitwise copy construct and assignment
         sampledSurfaces(const sampledSurfaces&);

src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C

@@ -166,13 +166,18 @@ void Foam::sampledSurfaces::sampleAndWrite
 
 
 template<class GeoField>
-void Foam::sampledSurfaces::sampleAndWrite(const fvMesh& mesh)
+void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& allObjects)
 {
     forAll (fieldSelection_, fieldI)
     {
         const wordRe field = fieldSelection_[fieldI];
+        IOobject* fieldIOPtr = allObjects.lookup(field);
 
-        if (mesh.thisDb().foundObject<GeoField>(field))
+        if
+        (
+            fieldIOPtr != NULL
+         && fieldIOPtr->headerClassName() == GeoField::typeName
+        )
         {
             if (Pstream::master() && verbose_)
             {
@@ -181,10 +186,18 @@ void Foam::sampledSurfaces::sampleAndWrite(const fvMesh& mesh)
 
             if (loadFromFiles_)
             {
-                const GeoField& geoField =
+                const GeoField geoField
-                    mesh.thisDb().lookupObject<GeoField>(field);
+                (
+                    IOobject
+                    (
+                        field,
+                        mesh_.time().timeName(),
+                        mesh_,
+                        IOobject::MUST_READ
+                    ),
+                    mesh_
+                );
 
-                const_cast<GeoField&>(geoField).readOpt() = IOobject::MUST_READ;
                 sampleAndWrite(geoField);
             }
             else

src/thermophysicalModels/reactionThermo/Make/options

@@ -2,7 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 
@@ -10,4 +10,5 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lfluidThermophysicalModels \
     -lspecie \
+    -lsolidSpecie \
     -lmeshTools

src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C

@@ -165,20 +165,12 @@ const ThermoType& Foam::multiComponentMixture<ThermoType>::cellVolMixture
     }
 
     mixtureVol_ =
-        Y_[0][celli]
+        Y_[0][celli]/speciesData_[0].rho(p, T)/rhoInv*speciesData_[0];
-      / speciesData_[0].rho(p, T)
-      / rhoInv
-      / speciesData_[0].W()
-      * speciesData_[0];
 
     for (label n=1; n<Y_.size(); n++)
     {
         mixtureVol_ +=
-            Y_[n][celli]
+            Y_[n][celli]/speciesData_[n].rho(p, T)/rhoInv*speciesData_[n];
-          / speciesData_[n].rho(p, T)
-          / rhoInv
-          / speciesData_[n].W()
-          * speciesData_[n];
     }
 
     return mixtureVol_;
@@ -198,24 +190,19 @@ patchFaceVolMixture
     scalar rhoInv = 0.0;
     forAll(speciesData_, i)
     {
-        rhoInv += Y_[i].boundaryField()[patchi][facei]/speciesData_[i].rho(p, T);
+        rhoInv +=
+            Y_[i].boundaryField()[patchi][facei]/speciesData_[i].rho(p, T);
     }
 
     mixtureVol_ =
-        Y_[0].boundaryField()[patchi][facei]
+        Y_[0].boundaryField()[patchi][facei]/speciesData_[0].rho(p, T)/rhoInv
-      / speciesData_[0].rho(p, T)
-      / rhoInv
-      / speciesData_[0].W()
       * speciesData_[0];
 
     for (label n=1; n<Y_.size(); n++)
     {
         mixtureVol_ +=
-            Y_[n].boundaryField()[patchi][facei]
+            Y_[n].boundaryField()[patchi][facei]/speciesData_[n].rho(p,T)
-          / speciesData_[n].rho(p,T)
+          / rhoInv*speciesData_[n];
-          / rhoInv
-          / speciesData_[n].W()
-          * speciesData_[n];
     }
 
     return mixtureVol_;

src/thermophysicalModels/solidChemistryModel/Make/options

@@ -1,10 +1,11 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude  \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude
 

src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C

@@ -181,11 +181,7 @@ ODESolidChemistryModel
             mesh.lookupObject<dictionary>
             (
                 "thermophysicalProperties"
-<<<<<<< HEAD
             ).subDict(pyrolisisGases_[gasI]);
-=======
-            ).subDict(pyrolisisGases_[gasI] + "Coeffs");
->>>>>>> 6389bd9649619832d64fcbf6a12a0ec6b8aab09a
 
         gasThermo_.set
         (

src/thermophysicalModels/solidSpecie/Make/files

@@ -1,4 +1,3 @@
-solidSpecie/solidSpecie.C
 reaction/reactions/makeSolidReactions.C
 
 LIB = $(FOAM_LIBBIN)/libsolidSpecie

src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H

@@ -32,7 +32,7 @@ Description
 #ifndef solidThermoPhysicsTypes_H
 #define solidThermoPhysicsTypes_H
 
-#include "solidSpecie.H"
+#include "specie.H"
 #include "rhoConst.H"
 #include "hConstThermo.H"
 #include "hExponentialThermo.H"
@@ -53,7 +53,7 @@ namespace Foam
             <
                 hConstThermo
                 <
-                    rhoConst<solidSpecie>
+                    rhoConst<specie>
                 >,
                 sensibleEnthalpy
             >
@@ -67,7 +67,7 @@ namespace Foam
             <
                 hExponentialThermo
                 <
-                    rhoConst<solidSpecie>
+                    rhoConst<specie>
                 >,
                 sensibleEnthalpy
             >

src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecie.C

@@ -1,65 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "solidSpecie.H"
-#include "IOstreams.H"
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::solidSpecie::solidSpecie(const dictionary& dict)
-:
-    specie
-    (
-        dict.dictName(),
-        readScalar(dict.subDict("solidSpecie").lookup("nMoles")),
-        scalar(1.0)
-    )
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::solidSpecie::write(Ostream& os) const
-{
-    dictionary dict("solidSpecie");
-    dict.add("nMoles", nMoles());
-    os  << indent << dict.dictName() << dict;
-}
-
-
-// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const solidSpecie& st)
-{
-    os  << st.name() << tab
-        << st.nMoles();
-
-    os.check("Ostream& operator<<(Ostream& os, const solidSpecie& st)");
-    return os;
-}
-
-
-// ************************************************************************* //

src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecie.H

@@ -1,148 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::solidSpecie
-
-Description
-    Base class of the solid thermophysical property types.
-
-SourceFiles
-    solidSpecieI.H
-    solidSpecie.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef solidSpecie_H
-#define solidSpecie_H
-
-#include "word.H"
-#include "scalar.H"
-#include "dictionary.H"
-#include "specie.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class Istream;
-class Ostream;
-
-/*---------------------------------------------------------------------------*\
-                           Class solidSpecie Declaration
-\*---------------------------------------------------------------------------*/
-
-class solidSpecie
-:
-    public specie
-{
-
-    // Private Member Functions
-
-        //- Construct from components without name
-        inline solidSpecie(const scalar nMoles, const scalar molWeight);
-
-
-public:
-
-    //- Runtime type information
-    ClassName("solidSpecie");
-
-
-    // Constructors
-
-        //- Construct from components with name
-        inline solidSpecie
-        (
-            const word& name,
-            const scalar nMoles,
-            const scalar molWeight
-        );
-
-        //- Construct as copy
-        inline solidSpecie(const solidSpecie&);
-
-        //- Construct as named copy
-        inline solidSpecie(const word& name, const solidSpecie&);
-
-        //- Construct from dictionary
-        solidSpecie(const dictionary& dict);
-
-
-    // Member Functions
-
-
-        // I-O
-
-            //- Write to Ostream
-            void write(Ostream& os) const;
-
-
-    // Member operators
-
-        inline void operator=(const solidSpecie&);
-
-        inline void operator+=(const solidSpecie&);
-        inline void operator-=(const solidSpecie&);
-
-        inline void operator*=(const scalar);
-
-
-    // Friend operators
-
-        inline friend solidSpecie operator+
-        (
-            const solidSpecie&, const solidSpecie&
-        );
-        inline friend solidSpecie operator-
-        (
-            const solidSpecie&, const solidSpecie&
-        );
-
-        inline friend solidSpecie operator*(const scalar, const solidSpecie&);
-
-        inline friend solidSpecie operator==
-        (
-            const solidSpecie&, const solidSpecie&
-        );
-
-    // Ostream Operator
-
-        friend Ostream& operator<<(Ostream&, const solidSpecie&);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "solidSpecieI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecieI.H

@@ -1,148 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "solidSpecie.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-inline solidSpecie::solidSpecie
-(
-    const word& name,
-    const scalar nMoles,
-    const scalar molWeight
-)
-:
-    specie(name, nMoles, scalar(1))
-{}
-
-
-inline solidSpecie::solidSpecie
-(
-    const scalar nMoles, const scalar molWeight
-)
-:
-    specie(nMoles, molWeight)
-{}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-inline solidSpecie::solidSpecie(const solidSpecie& st)
-:
-    specie(st.name(), st.nMoles(), scalar(1))
-{}
-
-
-inline solidSpecie::solidSpecie(const word& name, const solidSpecie& st)
-:
-    specie(name, st.nMoles(), scalar(1))
-{}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-inline void solidSpecie::operator=(const solidSpecie& st)
-{
-    specie::operator=(st);
-}
-
-
-inline void solidSpecie::operator+=(const solidSpecie& st)
-{
-    specie::operator+=(st);
-}
-
-
-inline void solidSpecie::operator-=(const solidSpecie& st)
-{
-    specie::operator-=(st);
-}
-
-
-inline void solidSpecie::operator*=(const scalar s)
-{
-    specie::operator*=(s);
-}
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-inline solidSpecie operator+(const solidSpecie& st1, const solidSpecie& st2)
-{
-
-    scalar sumNmoles = max(st1.nMoles() + st2.nMoles(), SMALL);
-
-    return solidSpecie
-    (
-        sumNmoles,
-        st1.nMoles()/sumNmoles*st1.W()
-      + st2.nMoles()/sumNmoles*st2.W()
-    );
-}
-
-
-inline solidSpecie operator-(const solidSpecie& st1, const solidSpecie& st2)
-{
-    scalar diffNmoles = st1.nMoles() - st2.nMoles();
-    if (mag(diffNmoles) < SMALL)
-    {
-        diffNmoles = SMALL;
-    }
-
-    return solidSpecie
-    (
-        diffNmoles,
-        st1.nMoles()/diffNmoles*st1.W()
-      - st2.nMoles()/diffNmoles*st2.W()
-    );
-}
-
-
-inline solidSpecie operator*(const scalar s, const solidSpecie& st)
-{
-    return solidSpecie
-    (
-        s*st.nMoles(),
-        st.W()
-    );
-}
-
-
-inline solidSpecie operator==(const solidSpecie& st1, const solidSpecie& st2)
-{
-    return st2 - st1;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //

src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C

@@ -27,7 +27,7 @@ License
 #include "solidReactionThermo.H"
 #include "heSolidThermo.H"
 
-#include "solidSpecie.H"
+#include "specie.H"
 #include "rhoConst.H"
 #include "hConstThermo.H"
 #include "hExponentialThermo.H"
@@ -58,7 +58,7 @@ makeReactingSolidThermo
     sensibleEnthalpy,
     hConstThermo,
     rhoConst,
-    solidSpecie
+    specie
 );
 
 
@@ -71,7 +71,7 @@ makeReactingSolidThermo
     sensibleEnthalpy,
     hConstThermo,
     rhoConst,
-    solidSpecie
+    specie
 );
 
 

src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C

@@ -27,7 +27,7 @@ License
 #include "solidThermo.H"
 #include "heSolidThermo.H"
 
-#include "solidSpecie.H"
+#include "specie.H"
 #include "rhoConst.H"
 #include "hConstThermo.H"
 #include "hExponentialThermo.H"
@@ -56,7 +56,7 @@ makeSolidThermo
     sensibleEnthalpy,
     hConstThermo,
     rhoConst,
-    solidSpecie
+    specie
 );
 
 makeSolidThermo
@@ -68,7 +68,7 @@ makeSolidThermo
     sensibleEnthalpy,
     hConstThermo,
     rhoConst,
-    solidSpecie
+    specie
 );
 
 makeSolidThermo
@@ -80,7 +80,7 @@ makeSolidThermo
     sensibleEnthalpy,
     hExponentialThermo,
     rhoConst,
-    solidSpecie
+    specie
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C

@@ -75,7 +75,7 @@ Foam::string Foam::Reaction<ReactionThermo>::reactionStr() const
         {
             reaction << glhs()[i].stoichCoeff;
         }
-        reaction << species_[glhs()[i].index];
+        reaction << gasSpecies()[glhs()[i].index];
         if (mag(glhs()[i].exponent - glhs()[i].stoichCoeff) > SMALL)
         {
             reaction << "^" << glhs()[i].exponent;
@@ -113,7 +113,7 @@ Foam::string Foam::Reaction<ReactionThermo>::reactionStr() const
         {
             reaction << grhs()[i].stoichCoeff;
         }
-        reaction << species_[grhs()[i].index];
+        reaction << gasSpecies()[grhs()[i].index];
         if (mag(grhs()[i].exponent - grhs()[i].stoichCoeff) > SMALL)
         {
             reaction << "^" << grhs()[i].exponent;

src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H

@@ -67,60 +67,9 @@ Reaction<ReactionThermo>::rhs() const
 template<class ReactionThermo>
 inline Ostream& operator<<(Ostream& os, const Reaction<ReactionThermo>& r)
 {
-    //os.writeKeyword("reaction")
+   os << r.reactionStr()<< token::END_STATEMENT <<nl;
-    //    << r.reactionStr()<< token::END_STATEMENT <<nl;
 
-    os << r.type() << nl << "    ";
+   return os;
-
-    forAll(r.lhs_, i)
-    {
-        const typename Reaction<ReactionThermo>::specieCoeffs& sc = r.lhs_[i];
-
-        if (sc.stoichCoeff != 1)
-        {
-            os << sc.stoichCoeff;
-        }
-
-        os << r.species_[sc.index];
-
-        if (sc.exponent != sc.stoichCoeff)
-        {
-            os << '^' << sc.exponent;
-        }
-
-        if (i < r.lhs_.size() - 1)
-        {
-            os << " + ";
-        }
-    }
-
-    os << " = ";
-
-    forAll(r.rhs_, i)
-    {
-        const typename Reaction<ReactionThermo>::specieCoeffs& sc = r.rhs_[i];
-
-        if (sc.stoichCoeff != 1)
-        {
-            os << sc.stoichCoeff;
-        }
-
-        os << r.species_[sc.index];
-
-        if (sc.exponent != sc.stoichCoeff)
-        {
-            os << '^' << sc.exponent;
-        }
-
-        if (i < r.rhs_.size() - 1)
-        {
-            os << " + ";
-        }
-    }
-
-    os  << endl << "   ";
-
-    return os;
 }
 
 

src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C

@@ -269,11 +269,11 @@ void temperatureThermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
         tmp<scalarField> tKDeltaw(new scalarField(patch().size()));
         scalarField KDeltaw = tKDeltaw();
 
-        // Create fields for solid properties
+        // Create fields for solid properties (p paramater not used)
         forAll(KDeltaw, i)
         {
             KDeltaw[i] =
-                solidPtr_().kappa((Tp[i] + nbrTw[i])/2.0)/thickness_[i];
+                solidPtr_().kappa(0.0, (Tp[i] + nbrTw[i])/2.0)/thickness_[i];
         }
 
         const scalarField q

src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H

@@ -74,14 +74,6 @@ class temperatureThermoBaffle1DFvPatchScalarField
         autoPtr<solidType> solidPtr_;
 
 
-    // Private Member Functions
-
-        scalar kappa(const scalar T) const
-        {
-            return solidPtr_().kappa(T);
-        }
-
-
 public:
 
     //- Runtime type information

tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T

@@ -17,7 +17,7 @@ FoamFile
 
 dimensions      [0 0 0 1 0 0 0];
 
-internalField   uniform 500;//298.15;
+internalField   uniform 298.15;
 
 boundaryField
 {

tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/wood

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      v;
+    object      wood;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/reactions

@@ -1,6 +1,6 @@
 species
 (
-    v
+    wood
     char
 );
 
@@ -14,7 +14,7 @@ reactions
     charReaction
     {
         type        irreversibleArrheniusSolidReaction;
-        reaction    "v^4.86 = char + gas";
+        reaction    "wood^4.86 = char + gas";
         A           7.83e10;
         Ta          15274.57;
         Tcrit       400;

tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid

@@ -15,11 +15,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-v
+wood
 {
-    solidSpecie
+    specie
     {
         nMoles      1;
+        molWeight   100;
     }
     transport
     {
@@ -38,9 +39,10 @@ v
 
 char
 {
-    solidSpecie
+    specie
     {
         nMoles      1;
+        molWeight   50;
     }
     transport
     {

tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties

@@ -21,7 +21,7 @@ thermoType
     transport       constIso;
     thermo          hConst;
     equationOfState rhoConst;
-    specie          solidSpecie;
+    specie          specie;
     energy          sensibleEnthalpy;
 }
 

tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties

@@ -16,6 +16,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+radiation       on;
+
 radiationModel  fvDOM;
 
 fvDOMCoeffs
@@ -50,7 +52,7 @@ greyMeanAbsorptionEmissionCoeffs
         Tcommon         300;   //Common Temp
         invTemp         true;   //Is the polynomio using inverse temperature.
         Tlow            200;   //Low Temp
-        Thigh           2000;  //High Temp
+        Thigh           2500;  //High Temp
 
         loTcoeffs       //coefss for T < Tcommon
         (
@@ -78,7 +80,7 @@ greyMeanAbsorptionEmissionCoeffs
         Tcommon         300;
         invTemp         true;
         Tlow            200;
-        Thigh           2000;
+        Thigh           2500;
 
         loTcoeffs
         (

tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict

@@ -16,19 +16,19 @@ FoamFile
 
 application     fireFoam;
 
-startFrom       latestTime;
+startFrom       startTime;
 
 startTime       0;
 
 stopAt          endTime;
 
-endTime         15;
+endTime         5;
 
 deltaT          0.03;
 
 writeControl    adjustableRunTime;
 
-writeInterval   1
+writeInterval   1;
 
 purgeWrite      0;
 

tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion

@@ -111,7 +111,7 @@ dictionaryReplacement
                 thermoType
                 {
                     type            heSolidThermo;
-                    mixture         pureSolidMixture;
+                    mixture         pureMixture;
                     transport       constIso;
                     thermo          hConst;
                     equationOfState rhoConst;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/char

@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Tchar;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0.5;
-
-boundaryField
-{
-    ".*"
-    {
-        type            calculated;
-        value           uniform 0.5;
-    }
-}
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pmma

@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Ypmma;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0.5;
-
-boundaryField
-{
-    ".*"
-    {
-        type            calculated;
-        value           uniform 0.5;
-    }
-}
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun

@@ -15,11 +15,6 @@ do
    rm -f 0*/$i/{mut,alphat,epsilon,k,U,p_rgh}
 done
 
-# remove solid fields from fluid regions (important for post-processing)
-for i in bottomAir topAir
-do
-   rm -f 0*/$i/{Ychar,Ypmma}
-done
 
 for i in bottomAir topAir heater leftSolid rightSolid
 do

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties

@@ -21,15 +21,16 @@ thermoType
     transport       constIso;
     thermo          hConst;
     equationOfState rhoConst;
-    specie          solidSpecie;
+    specie          specie;
     energy          sensibleEnthalpy;
 }
 
 mixture
 {
-    solidSpecie
+    specie
     {
         nMoles      1;
+        molWeight   50;
     }
 
     transport
@@ -49,58 +50,4 @@ mixture
     }
 }
 
-species
-(
-    pmma char
-);
-
-pmma
-{
-    solidSpecie
-    {
-        nMoles      1;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-char
-{
-    solidSpecie
-    {
-        nMoles      1;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties

@@ -1,107 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType
-{
-    type            heSolidThermo;
-    mixture         pureMixture;
-    transport       constIso;
-    thermo          hConst;
-    equationOfState rhoConst;
-    specie          solidSpecie;
-    energy          sensibleEnthalpy;
-}
-
-mixture
-{
-    solidSpecie
-    {
-        nMoles      1;
-    }
-
-    transport
-    {
-        kappa   80;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      450;
-    }
-
-    equationOfState
-    {
-        rho     8000;
-    }
-}
-
-species
-(
-    pmma char
-);
-
-pmma
-{
-    solidSpecie
-    {
-        nMoles      1;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-char
-{
-    solidSpecie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties

@@ -0,0 +1 @@
+../heater/thermophysicalProperties

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties

@@ -1,106 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType
-{
-    type            heSolidThermo;
-    mixture         pureMixture;
-    transport       constIso;
-    thermo          hConst;
-    equationOfState rhoConst;
-    specie          solidSpecie;
-    energy          sensibleEnthalpy;
-}
-
-mixture
-{
-    solidSpecie
-    {
-        nMoles      1;
-    }
-
-    transport
-    {
-        kappa   80;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      450;
-    }
-
-    equationOfState
-    {
-        rho     8000;
-    }
-}
-
-species
-(
-    pmma char
-);
-
-pmma
-{
-    solidSpecie
-    {
-        nMoles      1;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-char
-{
-    solidSpecie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties

@@ -0,0 +1 @@
+../heater/thermophysicalProperties

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/Allrun

@@ -15,11 +15,6 @@ do
    rm -f 0*/$i/{mut,alphat,epsilon,k,U,p_rgh}
 done
 
-## remove solid fields from fluid regions (important for post-processing)
-for i in bottomWater topAir
-do
-   rm -f 0*/$i/{Ypmma,Ychar}
-done
 
 for i in bottomWater topAir heater leftSolid rightSolid
 do

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties

@@ -17,7 +17,7 @@ FoamFile
 thermoType
 {
     type            heSolidThermo;
-    mixture         pureSolidMixture;
+    mixture         pureMixture;
     transport       constIso;
     thermo          hConst;
     equationOfState rhoConst;
@@ -50,60 +50,4 @@ mixture
     }
 }
 
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties

@@ -1,109 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType
-{
-    type            heSolidThermo;
-    mixture         pureSolidMixture;
-    transport       constIso;
-    thermo          hConst;
-    equationOfState rhoConst;
-    specie          specie;
-    energy          sensibleEnthalpy;
-}
-
-mixture
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   12;
-    }
-
-    transport
-    {
-        kappa   80;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      450;
-    }
-
-    equationOfState
-    {
-        rho     8000;
-    }
-}
-
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties

@@ -0,0 +1 @@
+../heater/thermophysicalProperties

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties

@@ -1,109 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType
-{
-    type            heSolidThermo;
-    mixture         pureSolidMixture;
-    transport       constIso;
-    thermo          hConst;
-    equationOfState rhoConst;
-    specie          specie;
-    energy          sensibleEnthalpy;
-}
-
-mixture
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   12;
-    }
-
-    transport
-    {
-        kappa   80;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      450;
-    }
-
-    equationOfState
-    {
-        rho     8000;
-    }
-}
-
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties

@@ -0,0 +1 @@
+../heater/thermophysicalProperties

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Ychar

@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Ychar;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0.5;
-
-boundaryField
-{
-    ".*"
-    {
-        type            calculated;
-        value           uniform 0.5;
-    }
-}
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Ypmma

@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Ypmma;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0.5;
-
-boundaryField
-{
-    ".*"
-    {
-        type            calculated;
-        value           uniform 0.5;
-    }
-}
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun

@@ -19,11 +19,6 @@ do
    rm -f 0*/$i/{mut,alphat,epsilon,k,U,p_rgh}
 done
 
-# No solid fields to remove from fluid regions (important for post-processing)
-for i in bottomAir topAir
-do
-   rm -f 0*/$i/{Ypmma, Ychar}
-done
 
 for i in bottomAir topAir heater leftSolid rightSolid
 do

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties

@@ -17,7 +17,7 @@ FoamFile
 thermoType
 {
     type            heSolidThermo;
-    mixture         pureSolidMixture;
+    mixture         pureMixture;
     transport       constIso;
     thermo          hConst;
     equationOfState rhoConst;
@@ -50,60 +50,4 @@ mixture
     }
 }
 
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties

@@ -1,109 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType
-{
-    type            heSolidThermo;
-    mixture         pureSolidMixture;
-    transport       constIso;
-    thermo          hConst;
-    equationOfState rhoConst;
-    specie          specie;
-    energy          sensibleEnthalpy;
-}
-
-mixture
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   12;
-    }
-
-    transport
-    {
-        kappa   80;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      450;
-    }
-
-    equationOfState
-    {
-        rho     8000;
-    }
-}
-
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties

@@ -0,0 +1 @@
+../heater/thermophysicalProperties

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties

@@ -1,109 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType
-{
-    type            heSolidThermo;
-    mixture         pureSolidMixture;
-    transport       constIso;
-    thermo          hConst;
-    equationOfState rhoConst;
-    specie          specie;
-    energy          sensibleEnthalpy;
-}
-
-mixture
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   12;
-    }
-
-    transport
-    {
-        kappa   80;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      450;
-    }
-
-    equationOfState
-    {
-        rho     8000;
-    }
-}
-
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties

@@ -0,0 +1 @@
+../heater/thermophysicalProperties

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Ychar

@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Ychar;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0.5;
-
-boundaryField
-{
-    ".*"
-    {
-        type            calculated;
-        value           uniform 0.5;
-    }
-}
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Ypmma

@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Ypmma;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0.5;
-
-boundaryField
-{
-    ".*"
-    {
-        type            calculated;
-        value           uniform 0.5;
-    }
-}
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allclean

@@ -18,6 +18,6 @@ rm -rf constant/topAir/polyMesh
 rm -rf constant/heater/polyMesh
 rm -rf constant/leftSolid/polyMesh
 rm -rf constant/rightSolid/polyMesh
-rm -rf topAir_maxX topAir_minX
+rm -rf postProcessing
 
 # ----------------------------------------------------------------- end-of-file

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun

@@ -15,12 +15,6 @@ do
    rm -f 0*/$i/{mut,alphat,epsilon,k,U,p_rgh}
 done
 
-## remove solid fields from fluid regions (important for post-processing)
-for i in bottomAir topAir
-do
-   rm -f 0*/$i/{Ypmma,Ychar}
-done
-
 for i in bottomAir topAir heater leftSolid rightSolid
 do
    changeDictionary -region $i > log.changeDictionary.$i 2>&1

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties

@@ -17,7 +17,7 @@ FoamFile
 thermoType
 {
     type            heSolidThermo;
-    mixture         pureSolidMixture;
+    mixture         pureMixture;
     transport       constIso;
     thermo          hConst;
     equationOfState rhoConst;
@@ -50,60 +50,4 @@ mixture
     }
 }
 
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties

@@ -1,109 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType
-{
-    type            heSolidThermo;
-    mixture         pureSolidMixture;
-    transport       constIso;
-    thermo          hConst;
-    equationOfState rhoConst;
-    specie          specie;
-    energy          sensibleEnthalpy;
-}
-
-mixture
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   12;
-    }
-
-    transport
-    {
-        kappa   80;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      450;
-    }
-
-    equationOfState
-    {
-        rho     8000;
-    }
-}
-
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties

@@ -0,0 +1 @@
+../heater/thermophysicalProperties

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties

@@ -1,109 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType
-{
-    type            heSolidThermo;
-    mixture         pureSolidMixture;
-    transport       constIso;
-    thermo          hConst;
-    equationOfState rhoConst;
-    specie          specie;
-    energy          sensibleEnthalpy;
-}
-
-mixture
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   12;
-    }
-
-    transport
-    {
-        kappa   80;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      450;
-    }
-
-    equationOfState
-    {
-        rho     8000;
-    }
-}
-
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties

@@ -0,0 +1 @@
+../heater/thermophysicalProperties

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Ychar

@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Ychar;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0.5;
-
-boundaryField
-{
-    ".*"
-    {
-        type            calculated;
-        value           uniform 0.5;
-    }
-}
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Ypmma

@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Ypmma;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0.5;
-
-boundaryField
-{
-    ".*"
-    {
-        type            calculated;
-        value           uniform 0.5;
-    }
-}
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun

@@ -15,12 +15,6 @@ do
    rm -f 0*/$i/{rho,mut,alphat,epsilon,k,U,p_rgh,Qr,G,IDefault}
 done
 
-## remove solid fields from fluid regions (important for post-processing)
-for i in bottomAir topAir
-do
-    rm -f 0*/$i/{Ypmma,Ychar}
-done
-
 for i in bottomAir topAir heater leftSolid rightSolid
 do
     changeDictionary -region $i > log.changeDictionary.$i 2>&1

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties

@@ -17,7 +17,7 @@ FoamFile
 thermoType
 {
     type            heSolidThermo;
-    mixture         pureSolidMixture;
+    mixture         pureMixture;
     transport       constIso;
     thermo          hConst;
     equationOfState rhoConst;
@@ -50,60 +50,4 @@ mixture
     }
 }
 
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties

@@ -1,109 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType
-{
-    type            heSolidThermo;
-    mixture         pureSolidMixture;
-    transport       constIso;
-    thermo          hConst;
-    equationOfState rhoConst;
-    specie          specie;
-    energy          sensibleEnthalpy;
-}
-
-mixture
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   12;
-    }
-
-    transport
-    {
-        kappa   80;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      450;
-    }
-
-    equationOfState
-    {
-        rho     8000;
-    }
-}
-
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties

@@ -0,0 +1 @@
+../heater/thermophysicalProperties

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties

@@ -1,109 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType
-{
-    type            heSolidThermo;
-    mixture         pureSolidMixture;
-    transport       constIso;
-    thermo          hConst;
-    equationOfState rhoConst;
-    specie          specie;
-    energy          sensibleEnthalpy;
-}
-
-mixture
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   12;
-    }
-
-    transport
-    {
-        kappa   80;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      450;
-    }
-
-    equationOfState
-    {
-        rho     8000;
-    }
-}
-
-solidComponents
-(
-    pmma char
-);
-
-pmmaCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   100;
-    }
-
-    transport
-    {
-        kappa   0.152;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      1462;
-    }
-
-    equationOfState
-    {
-        rho     1114.0;
-    }
-}
-
-charCoeffs
-{
-    specie
-    {
-        nMoles      1;
-        molWeight   50;
-    }
-
-    transport
-    {
-        kappa   0.4;
-    }
-
-    thermodynamics
-    {
-        Hf      0;
-        Cp      611.0;
-    }
-
-    equationOfState
-    {
-        rho     11.5;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties

@@ -0,0 +1 @@
+../heater/thermophysicalProperties