Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C

@@ -502,15 +502,11 @@ template<class CloudType>
 void Foam::KinematicCloud<CloudType>::setParcelThermoProperties
 (
     parcelType& parcel,
-    const scalar lagrangianDt,
+    const scalar lagrangianDt
-    const bool fullyDescribed
 )
-{
-    if (!fullyDescribed)
 {
     parcel.rho() = constProps_.rho0();
 }
-}
 
 
 template<class CloudType>

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H

@@ -490,8 +490,7 @@ public:
             void setParcelThermoProperties
             (
                 parcelType& parcel,
-                const scalar lagrangianDt,
+                const scalar lagrangianDt
-                const bool fullyDescribed
             );
 
             //- Check parcel properties

src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C

@@ -227,30 +227,14 @@ template<class CloudType>
 void Foam::ReactingCloud<CloudType>::setParcelThermoProperties
 (
     parcelType& parcel,
-    const scalar lagrangianDt,
+    const scalar lagrangianDt
-    const bool fullyDescribed
 )
 {
-    CloudType::setParcelThermoProperties(parcel, lagrangianDt, fullyDescribed);
+    CloudType::setParcelThermoProperties(parcel, lagrangianDt);
 
-    if (!fullyDescribed)
-    {
     parcel.pc() = this->thermo().thermo().p()[parcel.cell()];
     parcel.Y() = composition().YMixture0();
 }
-    else
-    {
-        checkSuppliedComposition
-        (
-            parcel.Y(),
-            composition().YMixture0(),
-            "YMixture"
-        );
-    }
-
-    // derived information - store initial mass
-    parcel.mass0() = parcel.mass();
-}
 
 
 template<class CloudType>
@@ -262,6 +246,19 @@ void Foam::ReactingCloud<CloudType>::checkParcelProperties
 )
 {
     CloudType::checkParcelProperties(parcel, lagrangianDt, fullyDescribed);
+
+    if (fullyDescribed)
+    {
+        checkSuppliedComposition
+        (
+            parcel.Y(),
+            composition().YMixture0(),
+            "YMixture"
+        );
+    }
+
+    // derived information - store initial mass
+    parcel.mass0() = parcel.mass();
 }
 
 

src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H

@@ -271,8 +271,7 @@ public:
             void setParcelThermoProperties
             (
                 parcelType& parcel,
-                const scalar lagrangianDt,
+                const scalar lagrangianDt
-                const bool fullyDescribed
             );
 
             //- Check parcel properties

src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C

@@ -158,24 +158,37 @@ template<class CloudType>
 void Foam::ReactingMultiphaseCloud<CloudType>::setParcelThermoProperties
 (
     parcelType& parcel,
-    const scalar lagrangianDt,
+    const scalar lagrangianDt
-    const bool fullyDescribed
 )
 {
-    CloudType::setParcelThermoProperties(parcel, lagrangianDt, fullyDescribed);
+    CloudType::setParcelThermoProperties(parcel, lagrangianDt);
 
     label idGas = this->composition().idGas();
     label idLiquid = this->composition().idLiquid();
     label idSolid = this->composition().idSolid();
 
-    if (!fullyDescribed)
-    {
     parcel.YGas() = this->composition().Y0(idGas);
     parcel.YLiquid() = this->composition().Y0(idLiquid);
     parcel.YSolid() = this->composition().Y0(idSolid);
 }
-    else
+
+
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::checkParcelProperties
+(
+    parcelType& parcel,
+    const scalar lagrangianDt,
+    const bool fullyDescribed
+)
 {
+    CloudType::checkParcelProperties(parcel, lagrangianDt, fullyDescribed);
+
+    if (fullyDescribed)
+    {
+        label idGas = this->composition().idGas();
+        label idLiquid = this->composition().idLiquid();
+        label idSolid = this->composition().idSolid();
+
         this->checkSuppliedComposition
         (
             parcel.YGas(),
@@ -198,18 +211,6 @@ void Foam::ReactingMultiphaseCloud<CloudType>::setParcelThermoProperties
 }
 
 
-template<class CloudType>
-void Foam::ReactingMultiphaseCloud<CloudType>::checkParcelProperties
-(
-    parcelType& parcel,
-    const scalar lagrangianDt,
-    const bool fullyDescribed
-)
-{
-    CloudType::checkParcelProperties(parcel, lagrangianDt, fullyDescribed);
-}
-
-
 template<class CloudType>
 void Foam::ReactingMultiphaseCloud<CloudType>::storeState()
 {

src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H

@@ -244,8 +244,7 @@ public:
             void setParcelThermoProperties
             (
                 parcelType& parcel,
-                const scalar lagrangianDt,
+                const scalar lagrangianDt
-                const bool fullyDescribed
             );
 
             //- Check parcel properties

src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C

@@ -237,18 +237,14 @@ template<class CloudType>
 void Foam::ThermoCloud<CloudType>::setParcelThermoProperties
 (
     parcelType& parcel,
-    const scalar lagrangianDt,
+    const scalar lagrangianDt
-    const bool fullyDescribed
 )
 {
-    CloudType::setParcelThermoProperties(parcel, lagrangianDt, fullyDescribed);
+    CloudType::setParcelThermoProperties(parcel, lagrangianDt);
 
-    if (!fullyDescribed)
-    {
     parcel.T() = constProps_.T0();
     parcel.Cp() = constProps_.Cp0();
 }
-}
 
 
 template<class CloudType>

src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H

@@ -285,8 +285,7 @@ public:
             void setParcelThermoProperties
             (
                 parcelType& parcel,
-                const scalar lagrangianDt,
+                const scalar lagrangianDt
-                const bool fullyDescribed
             );
 
             //- Check parcel properties

src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C

@@ -593,7 +593,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 );
 
                 // Check/set new parcel thermo properties
-                cloud.setParcelThermoProperties(*pPtr, dt, fullyDescribed());
+                cloud.setParcelThermoProperties(*pPtr, dt);
 
                 // Assign new parcel properties in injection model
                 setProperties(parcelI, newParcels, timeInj, *pPtr);
@@ -702,7 +702,7 @@ void Foam::InjectionModel<CloudType>::injectSteadyState
             );
 
             // Check/set new parcel thermo properties
-            cloud.setParcelThermoProperties(*pPtr, 0.0, fullyDescribed());
+            cloud.setParcelThermoProperties(*pPtr, 0.0);
 
             // Assign new parcel properties in injection model
             setProperties(parcelI, newParcels, 0.0, *pPtr);

src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C

@@ -161,14 +161,11 @@ template<class CloudType>
 void Foam::SprayCloud<CloudType>::setParcelThermoProperties
 (
     parcelType& parcel,
-    const scalar lagrangianDt,
+    const scalar lagrangianDt
-    const bool fullyDescribed
 )
 {
-    CloudType::setParcelThermoProperties(parcel, lagrangianDt, fullyDescribed);
+    CloudType::setParcelThermoProperties(parcel, lagrangianDt);
 
-    if (!fullyDescribed)
-    {
     const liquidMixtureProperties& liqMix = this->composition().liquids();
 
     const scalarField& Y(parcel.Y());
@@ -178,7 +175,6 @@ void Foam::SprayCloud<CloudType>::setParcelThermoProperties
     parcel.Cp() = liqMix.Cp(parcel.pc(), parcel.T(), X);
     parcel.rho() = liqMix.rho(parcel.pc(), parcel.T(), X);
 }
-}
 
 
 template<class CloudType>

src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H

@@ -213,8 +213,7 @@ public:
             void setParcelThermoProperties
             (
                 parcelType& parcel,
-                const scalar lagrangianDt,
+                const scalar lagrangianDt
-                const bool fullyDescribed
             );
 
             //- Check parcel properties

src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,13 @@ template<int PolySize>
 icoPolynomial<PolySize>::icoPolynomial(const dictionary& dict)
 :
     specie(dict),
-    rhoCoeffs_(dict.lookup("rhoCoeffs<" + Foam::name(PolySize) + '>'))
+    rhoCoeffs_
+(
+    dict.subDict("equationOfState").lookup
+    (
+        "rhoCoeffs<" + Foam::name(PolySize) + '>'
+    )
+)
 {
     rhoCoeffs_ *= this->W();
 }
@@ -59,8 +65,15 @@ template<int PolySize>
 void icoPolynomial<PolySize>::write(Ostream& os) const
 {
     specie::write(os);
-    os.writeKeyword(word("rhoCoeffs<" + Foam::name(PolySize) + '>'))
+
-        << rhoCoeffs_/this->W() << token::END_STATEMENT << nl;
+    dictionary dict("equationOfState");
+    dict.add
+    (
+        word("rhoCoeffs<" + Foam::name(PolySize) + '>'),
+        rhoCoeffs_/this->W()
+    );
+
+    os  << dict;
 }
 
 

src/thermophysicalModels/specie/equationOfState/incompressible/incompressible.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,10 +40,23 @@ Foam::incompressible::incompressible(Istream& is)
 Foam::incompressible::incompressible(const dictionary& dict)
 :
     specie(dict),
-    rho_(readScalar(dict.lookup("rho")))
+    rho_(readScalar(dict.subDict("equationOfState").lookup("rho")))
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::incompressible::write(Ostream& os) const
+{
+    specie::write(os);
+
+    dictionary dict("equationOfState");
+    dict.add("rho", rho_);
+
+    os  << dict;
+}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const incompressible& ico)
@@ -51,7 +64,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const incompressible& ico)
     os  << static_cast<const specie&>(ico)
         << token::SPACE << ico.rho_;
 
-    os.check("Ostream& operator<<(Ostream& os, const incompressible& st)");
+    os.check("Ostream& operator<<(Ostream& os, const incompressible& ico)");
     return os;
 }
 

src/thermophysicalModels/specie/equationOfState/incompressible/incompressible.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,6 +83,8 @@ public:
 
     // Member functions
 
+        // Fundamental properties
+
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
@@ -93,6 +95,12 @@ public:
             inline scalar Z(scalar p, scalar T) const;
 
 
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
+
+
     // Member operators
 
         inline void operator+=(const incompressible&);

src/thermophysicalModels/specie/specie/specie.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,8 +54,8 @@ Foam::specie::specie(Istream& is)
 Foam::specie::specie(const dictionary& dict)
 :
     name_(dict.dictName()),
-    nMoles_(readScalar(dict.lookup("nMoles"))),
+    nMoles_(readScalar(dict.subDict("specie").lookup("nMoles"))),
-    molWeight_(readScalar(dict.lookup("molWeight")))
+    molWeight_(readScalar(dict.subDict("specie").lookup("molWeight")))
 {}
 
 
@@ -63,8 +63,10 @@ Foam::specie::specie(const dictionary& dict)
 
 void Foam::specie::write(Ostream& os) const
 {
-    os.writeKeyword("nMoles") << nMoles_ << token::END_STATEMENT << nl;
+    dictionary dict("specie");
-    os.writeKeyword("molWeight") << molWeight_ << token::END_STATEMENT << nl;
+    dict.add("nMoles", nMoles_);
+    dict.add("molWeight", molWeight_);
+    os  << dict;
 }
 
 

src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,8 +43,8 @@ template<class EquationOfState>
 Foam::eConstThermo<EquationOfState>::eConstThermo(const dictionary& dict)
 :
     EquationOfState(dict),
-    Cv_(readScalar(dict.lookup("Cv"))),
+    Cv_(readScalar(dict.subDict("thermodynamics").lookup("Cv"))),
-    Hf_(readScalar(dict.lookup("Hf")))
+    Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
 {}
 
 
@@ -54,8 +54,11 @@ template<class EquationOfState>
 void Foam::eConstThermo<EquationOfState>::write(Ostream& os) const
 {
     EquationOfState::write(os);
-    os.writeKeyword("Cv") << Cv_ << token::END_STATEMENT << nl;
+
-    os.writeKeyword("Hf") << Hf_ << token::END_STATEMENT << nl;
+    dictionary dict("thermodynamics");
+    dict.add("Cv", Cv_);
+    dict.add("Hf", Hf_);
+    os  << dict;
 }
 
 

src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,8 +43,8 @@ template<class equationOfState>
 Foam::hConstThermo<equationOfState>::hConstThermo(const dictionary& dict)
 :
     equationOfState(dict),
-    Cp_(readScalar(dict.lookup("Cp"))),
+    Cp_(readScalar(dict.subDict("thermodynamics").lookup("Cp"))),
-    Hf_(readScalar(dict.lookup("Hf")))
+    Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
 {}
 
 
@@ -54,8 +54,11 @@ template<class equationOfState>
 void Foam::hConstThermo<equationOfState>::write(Ostream& os) const
 {
     equationOfState::write(os);
-    os.writeKeyword("Cp") << Cp_ << token::END_STATEMENT << nl;
+
-    os.writeKeyword("Hf") << Hf_ << token::END_STATEMENT << nl;
+    dictionary dict("thermodynamics");
+    dict.add("Cp", Cp_);
+    dict.add("Hf", Hf_);
+    os  << dict;
 }
 
 

src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C

@@ -63,9 +63,15 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
 )
 :
     EquationOfState(dict),
-    Hf_(readScalar(dict.lookup("Hf"))),
+    Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf"))),
-    Sf_(readScalar(dict.lookup("Sf"))),
+    Sf_(readScalar(dict.subDict("thermodynamics").lookup("Sf"))),
-    CpCoeffs_(dict.lookup("CpCoeffs<" + Foam::name(PolySize) + '>')),
+    CpCoeffs_
+    (
+        dict.subDict("thermodynamics").lookup
+        (
+            "CpCoeffs<" + Foam::name(PolySize) + '>'
+        )
+    ),
     hCoeffs_(),
     sCoeffs_()
 {
@@ -93,10 +99,16 @@ void Foam::hPolynomialThermo<EquationOfState, PolySize>::write
 ) const
 {
     EquationOfState::write(os);
-    os.writeKeyword("Hf") << Hf_/this->W() << token::END_STATEMENT << nl;
+
-    os.writeKeyword("Sf") << Sf_/this->W() << token::END_STATEMENT << nl;
+    dictionary dict("thermodynamics");
-    os.writeKeyword(word("CpCoeffs<" + Foam::name(PolySize) + '>'))
+    dict.add("Hf", Hf_);
-        << CpCoeffs_/this->W() << token::END_STATEMENT << nl;
+    dict.add("Sf", Sf_);
+    dict.add
+    (
+        word("CpCoeffs<" + Foam::name(PolySize) + '>'),
+        CpCoeffs_/this->W()
+    );
+    os  << dict;
 }
 
 

src/thermophysicalModels/specie/thermo/janaf/janafThermo.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,11 +85,11 @@ template<class EquationOfState>
 Foam::janafThermo<EquationOfState>::janafThermo(const dictionary& dict)
 :
     EquationOfState(dict),
-    Tlow_(readScalar(dict.lookup("Tlow"))),
+    Tlow_(readScalar(dict.subDict("thermodynamics").lookup("Tlow"))),
-    Thigh_(readScalar(dict.lookup("Thigh"))),
+    Thigh_(readScalar(dict.subDict("thermodynamics").lookup("Thigh"))),
-    Tcommon_(readScalar(dict.lookup("Tcommon"))),
+    Tcommon_(readScalar(dict.subDict("thermodynamics").lookup("Tcommon"))),
-    highCpCoeffs_(dict.lookup("highCpCoeffs")),
+    highCpCoeffs_(dict.subDict("thermodynamics").lookup("highCpCoeffs")),
-    lowCpCoeffs_(dict.lookup("lowCpCoeffs"))
+    lowCpCoeffs_(dict.subDict("thermodynamics").lookup("lowCpCoeffs"))
 {
     checkInputData();
 }
@@ -101,13 +101,14 @@ template<class EquationOfState>
 void Foam::janafThermo<EquationOfState>::write(Ostream& os) const
 {
     EquationOfState::write(os);
-    os.writeKeyword("Tlow") << Tlow_ << token::END_STATEMENT << endl;
+
-    os.writeKeyword("Thigh") << Thigh_ << token::END_STATEMENT << endl;
+    dictionary dict("thermodynamics");
-    os.writeKeyword("Tcommon") << Tcommon_ << token::END_STATEMENT << endl;
+    dict.add("Tlow", Tlow_);
-    os.writeKeyword("highCpCoeffs") << highCpCoeffs_ << token::END_STATEMENT
+    dict.add("Thigh", Thigh_);
-        << endl;
+    dict.add("Tcommon", Tcommon_);
-    os.writeKeyword("lowCpCoeffs") << lowCpCoeffs_ << token::END_STATEMENT
+    dict.add("highCpCoeffs", highCpCoeffs_);
-        << endl;
+    dict.add("lowCpCoeffs", lowCpCoeffs_);
+    os  << dict;
 }
 
 

src/thermophysicalModels/specie/transport/const/constTransport.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,8 +43,8 @@ template<class Thermo>
 Foam::constTransport<Thermo>::constTransport(const dictionary& dict)
 :
     Thermo(dict),
-    mu_(readScalar(dict.lookup("mu"))),
+    mu_(readScalar(dict.subDict("transport").lookup("mu"))),
-    rPr_(1.0/readScalar(dict.lookup("Pr")))
+    rPr_(1.0/readScalar(dict.subDict("transport").lookup("Pr")))
 {}
 
 
@@ -55,9 +55,14 @@ void Foam::constTransport<Thermo>::constTransport::write(Ostream& os) const
 {
     os  << this->name() << endl;
     os  << token::BEGIN_BLOCK  << incrIndent << nl;
+
     Thermo::write(os);
-    os.writeKeyword("mu") << mu_ << token::END_STATEMENT << nl;
+
-    os.writeKeyword("Pr") << 1.0/rPr_ << token::END_STATEMENT << nl;
+    dictionary dict("transport");
+    dict.add("mu", mu_);
+    dict.add("Pr", 1.0/rPr_);
+    os  << dict;
+
     os  << decrIndent << token::END_BLOCK << nl;
 }
 

src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,8 +47,20 @@ Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
 )
 :
     Thermo(dict),
-    muCoeffs_(dict.lookup("muCoeffs<" + Foam::name(PolySize) + '>')),
+    muCoeffs_
-    kappaCoeffs_(dict.lookup("kappaCoeffs<" + Foam::name(PolySize) + '>'))
+    (
+        dict.subDict("transport").lookup
+        (
+            "muCoeffs<" + Foam::name(PolySize) + '>'
+        )
+    ),
+    kappaCoeffs_
+    (
+        dict.subDict("transport").lookup
+        (
+            "kappaCoeffs<" + Foam::name(PolySize) + '>'
+        )
+    )
 {
     muCoeffs_ *= this->W();
     kappaCoeffs_ *= this->W();
@@ -62,11 +74,22 @@ void Foam::polynomialTransport<Thermo, PolySize>::write(Ostream& os) const
 {
     os  << this->name() << endl;
     os  << token::BEGIN_BLOCK << incrIndent << nl;
+
     Thermo::write(os);
-    os.writeKeyword(word("muCoeffs<" + Foam::name(PolySize) + '>'))
+
-        << muCoeffs_/this->W() << token::END_STATEMENT << nl;
+    dictionary dict("transport");
-    os.writeKeyword(word("kappaCoeffs<" + Foam::name(PolySize) + '>'))
+    dict.add
-        << kappaCoeffs_/this->W() << token::END_STATEMENT << nl;
+    (
+        word("muCoeffs<" + Foam::name(PolySize) + '>'),
+        muCoeffs_/this->W()
+    );
+    dict.add
+    (
+        word("kappaCoeffs<" + Foam::name(PolySize) + '>'),
+        kappaCoeffs_/this->W()
+    );
+    os  << dict;
+
     os  << decrIndent << token::END_BLOCK << nl;
 }
 

src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,8 +43,8 @@ template<class Thermo>
 Foam::sutherlandTransport<Thermo>::sutherlandTransport(const dictionary& dict)
 :
     Thermo(dict),
-    As_(readScalar(dict.lookup("As"))),
+    As_(readScalar(dict.subDict("transport").lookup("As"))),
-    Ts_(readScalar(dict.lookup("Ts")))
+    Ts_(readScalar(dict.subDict("transport").lookup("Ts")))
 {}
 
 
@@ -55,9 +55,14 @@ void Foam::sutherlandTransport<Thermo>::write(Ostream& os) const
 {
     os  << this->name() << endl;
     os  << token::BEGIN_BLOCK  << incrIndent << nl;
+
     Thermo::write(os);
-    os.writeKeyword("As") << As_ << token::END_STATEMENT << nl;
+
-    os.writeKeyword("Ts") << Ts_ << token::END_STATEMENT << nl;
+    dictionary dict("transport");
+    dict.add("As", As_);
+    dict.add("Ts", Ts_);
+    os  << dict;
+
     os  << decrIndent << token::END_BLOCK << nl;
 }
 

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties

@@ -20,43 +20,70 @@ thermoType  hhuMixtureThermo<inhomogeneousMixture<sutherlandTransport<specieTher
 stoichiometricAirFuelMassRatio  stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.5776;
 
 fuel
+{
+    specie
     {
         nMoles          1;
         molWeight       44.0962;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 );
         lowCpCoeffs     ( 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017  );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 oxidant
+{
+    specie
     {
         nMoles          1;
         molWeight       28.8504;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           6000;
         Tcommon         1000;
         highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
         lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 burntProducts
+{
+    specie
     {
         nMoles         1;
         molWeight      28.3233;
+    }
+    thermodynamics
+    {
         Tlow           200;
         Thigh          6000;
         Tcommon        1000;
         highCpCoeffs   ( 3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104 );
         lowCpCoeffs    ( 3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188 );
+    }
+    transport
+    {
         As             1.67212e-06;
         Ts             170.672;
     }
+}
 
 // ************************************************************************* //

tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties

@@ -20,30 +20,48 @@ thermoType      hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieTh
 stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
 
 reactants
+{
+    specie
     {
         nMoles          1;
         molWeight       29.2068;
+    }
+    thermodynamics
+    {
         Tlow            100;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 );
         lowCpCoeffs     ( 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 products
+{
+    specie
     {
         nMoles          1;
         molWeight       28.5396;
+    }
+    thermodynamics
+    {
         Tlow            100;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 );
         lowCpCoeffs     ( 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //

tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties

@@ -20,30 +20,48 @@ thermoType      hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieTh
 stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
 
 reactants
+{
+    specie
     {
         nMoles          1;
         molWeight       29.2068;
+    }
+    thermodynamics
+    {
         Tlow            100;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 );
         lowCpCoeffs     ( 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 products
+{
+    specie
     {
         nMoles          1;
         molWeight       28.5396;
+    }
+    thermodynamics
+    {
         Tlow            100;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 );
         lowCpCoeffs     ( 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //

tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties

@@ -20,30 +20,48 @@ thermoType      hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieTh
 stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
 
 reactants
+{
+    specie
     {
         nMoles          24.8095;
         molWeight       29.4649;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.28069 0.00195035 -6.53483e-07 1.00239e-10 -5.64653e-15 -1609.55 4.41496 );
         lowCpCoeffs     ( 3.47696 0.000367499 1.84866e-06 -9.8993e-10 -3.10214e-14 -1570.81 3.76075 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 products
+{
+    specie
     {
         nMoles          1;
         molWeight       28.3233;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 );
         lowCpCoeffs     ( 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //

tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties

@@ -20,43 +20,70 @@ thermoType      hhuMixtureThermo<inhomogeneousMixture<sutherlandTransport<specie
 stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336;
 
 fuel
+{
+    specie
     {
         nMoles          1;
         molWeight       114.23;
+    }
+    thermodynamics
+    {
         Tlow            298.15;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 19.3963 0.0488137 -1.55798e-05 2.17831e-09 -1.08391e-13 -37133.9 -78.8531 );
         lowCpCoeffs     ( 0.429357 0.0765769 8.41306e-06 -5.86603e-08 2.79414e-11 -30446.4 25.6735 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 oxidant
+{
+    specie
     {
         nMoles          1;
         molWeight       28.8504;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           6000;
         Tcommon         1000;
         highCpCoeffs    ( 3.10205 0.00123963 -4.17512e-07 6.60292e-11 -3.87448e-15 -985.517 5.35187 );
         lowCpCoeffs     ( 3.58378 -0.0007269 1.66985e-06 -1.08452e-10 -4.31951e-13 -1050.53 3.11223 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 burntProducts
+{
+    specie
     {
         nMoles          1;
         molWeight       28.6068;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           6000;
         Tcommon         1000;
         highCpCoeffs    ( 3.12468 0.00178578 -5.94695e-07 9.09801e-11 -5.1246e-15 -11005.8 5.03593 );
         lowCpCoeffs     ( 3.47612 0.000758205 -3.68739e-07 1.3449e-09 -8.08868e-13 -11071.5 3.3058 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties

@@ -24,43 +24,70 @@ stoichiometricOxygenFuelMassRatio stoichiometricOxygenFuelMassRatio [ 0 0 0 0 0
 qFuel           qFuel [ 0 2 -2 0 0 0 0 ] 5.00264e+07;
 
 fuel
+{
+    specie
     {
         nMoles          1;
         molWeight       16.0428;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           6000;
         Tcommon         1000;
         highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
         lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 oxidant
+{
+    specie
     {
         nMoles          1;
         molWeight       28.8504;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           6000;
         Tcommon         1000;
         highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
         lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 burntProducts
+{
+specie
 {
     nMoles          1;
     molWeight       27.6334;
+}
+thermodynamics
+{
     Tlow            200;
     Thigh           6000;
     Tcommon         1000;
     highCpCoeffs    ( 3.0602 0.00182422 -5.93878e-07 8.93807e-11 -4.97595e-15 -10998.7 5.32209 );
     lowCpCoeffs     ( 3.54628 0.000378279 2.02797e-07 9.31602e-10 -6.84016e-13 -11102.1 2.90098 );
+}
+transport
+{
     As              1.67212e-06;
     Ts              170.672;
 }
+}
 
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties

@@ -24,43 +24,70 @@ stoichiometricOxygenFuelMassRatio stoichiometricOxygenFuelMassRatio [ 0 0 0 0 0
 qFuel           qFuel [ 0 2 -2 0 0 0 0 ] 5.00264e+07;
 
 fuel
+{
+    specie
     {
         nMoles          1;
         molWeight       16.0428;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           6000;
         Tcommon         1000;
         highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
         lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 oxidant
+{
+    specie
     {
         nMoles          1;
         molWeight       28.8504;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           6000;
         Tcommon         1000;
         highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
         lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 burntProducts
+{
+    specie
     {
         nMoles          1;
         molWeight       27.6334;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           6000;
         Tcommon         1000;
         highCpCoeffs    ( 3.0602 0.00182422 -5.93878e-07 8.93807e-11 -4.97595e-15 -10998.7 5.32209 );
         lowCpCoeffs     ( 3.54628 0.000378279 2.02797e-07 9.31602e-10 -6.84016e-13 -11102.1 2.90098 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //

tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas

@@ -16,69 +16,114 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 O2
+{
+    specie
     {
         nMoles          1;
         molWeight       31.9988;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
         lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
         lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 CH4
+{
+    specie
     {
         nMoles          1;
         molWeight       16.0428;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           6000;
         Tcommon         1000;
         highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
         lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 CO2
+{
+    specie
     {
         nMoles          1;
         molWeight       44.01;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396 );
         lowCpCoeffs     ( 2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
         lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.96;
+    }
+    thermodynamics
+    {
         Cp              1004.5;
         Hf              0;
+    }
+    transport
+    {
         As              1.458e-06;
         Ts              110.4;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties

@@ -20,17 +20,26 @@ Pr              0.72;
 thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.01348;
+    }
+    thermodynamics
+    {
         Tlow            100;
         Thigh           10000;
         Tcommon         1000;
         highCpCoeffs    ( 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221 );
         lowCpCoeffs     ( 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391 );
+    }
+    transport
+    {
         As              1.458e-06;
         Ts              110;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties

@@ -21,14 +21,23 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 //       for which the speed of sound is 1 m/s at a temperature of 1K
 //       and gamma = 7/5
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       11640.3;
+    }
+    thermodynamics
+    {
         Cp              2.5;
         Hf              0;
+    }
+    transport
+    {
         mu              0;
         Pr              1;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties

@@ -20,13 +20,22 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 mixture
 {
     // normalised gas
+    specie
+    {
         nMoles          1;
         molWeight       11640.3;
+    }
+    thermodynamics
+    {
         Cp              2.5;
         Hf              0;
+    }
+    transport
+    {
         mu              0;
         Pr              1;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.96;
+    }
+    thermodynamics
+    {
         Cp              1004.5;
         Hf              2.544e+06;
+    }
+    transport
+    {
         mu              0;
         Pr              1;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties

@@ -20,13 +20,22 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 mixture
 {
     // normalised gas
+    specie
+    {
         nMoles          1;
         molWeight       11640.3;
+    }
+    thermodynamics
+    {
         Cp              2.5;
         Hf              0;
+    }
+    transport
+    {
         mu              0;
         Pr              1;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles      1;
         molWeight   28.9;
+    }
+    thermodynamics
+    {
         Cp          1000;
         Hf          0;
+    }
+    transport
+    {
         mu          1.8e-05;
         Pr          0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles      1;
         molWeight   28.9;
+    }
+    thermodynamics
+    {
         Cp          1007;
         Hf          0;
+    }
+    transport
+    {
         As          1.4792e-06;
         Ts          116;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles      1;
         molWeight   28.9;
+    }
+    thermodynamics
+    {
         Cp          1007;
         Hf          0;
+    }
+    transport
+    {
         mu          1.84e-05;
         Pr          0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles      1;
         molWeight   28.9;
+    }
+    thermodynamics
+    {
         Cp          1007;
         Hf          0;
+    }
+    transport
+    {
         As          1.4792e-06;
         Ts          116;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1007;
         Hf              0;
+    }
+    transport
+    {
         As              1.4792e-06;
         Ts              116;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles      1;
         molWeight   28.9;
+    }
+    thermodynamics
+    {
         Cp          1007;
         Hf          0;
+    }
+    transport
+    {
         As          1.4792e-06;
         Ts          116;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles      1;
         molWeight   28.9;
+    }
+    thermodynamics
+    {
         Cp          1007;
         Hf          0;
+    }
+    transport
+    {
         As          1.4792e-06;
         Ts          116;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties

@@ -21,14 +21,23 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 //       for which the speed of sound is 1 m/s at a temperature of 1K
 //       and gamma = 7/5
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       11640.3;
+    }
+    thermodynamics
+    {
         Cp              2.5;
         Hf              0;
+    }
+    transport
+    {
         mu              0;
         Pr              1;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cv              717.5;
         Hf              0;
+    }
+    transport
+    {
         mu              0;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cv              717.5;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cv              717.5;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties

@@ -20,14 +20,23 @@ thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 pRef            100000;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.96;
+    }
+    thermodynamics
+    {
         Cp              1004.4;
         Hf              0;
+    }
+    transport
+    {
         mu              1.831e-05;
         Pr              0.705;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties

@@ -20,14 +20,23 @@ thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 pRef            100000;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties

@@ -20,14 +20,23 @@ thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 pRef            100000;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties

@@ -20,14 +20,23 @@ thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 pRef            100000;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties

@@ -18,14 +18,26 @@ thermoType
 hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<incompressible>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       18;
+    }
+    equationOfState
+    {
         rho             1000;
+    }
+    thermodynamics
+    {
         Cp              4181;
         Hf              0;
+    }
+    transport
+    {
         mu              959e-6;
         Pr              6.62;
     }
+}
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties

@@ -18,14 +18,23 @@ FoamFile
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
+{
+    specie
     {
         nMoles          1;
         molWeight       28.9;
+    }
+    thermodynamics
+    {
         Cp              1000;
         Hf              0;
+    }
+    transport
+    {
         mu              1.8e-05;
         Pr              0.7;
     }
+}
 
 
 // ************************************************************************* //

tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -16,64 +16,124 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 O2
+{
+    specie
     {
         nMoles          1;
         molWeight       31.9988;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 4.1388 -0.016603 3.3039e-05 -3.6455e-08 2.3302e-11 -8.5664e-15 1.6783e-18 -1.356e-22 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              6407.93;
-    rhoCoeffs<8>    ( 4.1388 -0.016603 3.3039e-05 -3.6455e-08 2.3302e-11 -8.5664e-15 1.6783e-18 -1.356e-22 );
         CpCoeffs<8>     ( 904.2 -0.35136 0.0019339 -2.6639e-06 1.8222e-09 -6.75e-13 1.2962e-16 -1.0131e-20 );
+    }
+    transport
+    {
         muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
         kappaCoeffs<8>  ( -0.0017889 9.5996e-05 -3.129e-08 7.9407e-12 -8.1996e-16 0 0 0 );
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 2.3302 -0.0093477 1.8601e-05 -2.0524e-08 1.3119e-11 -4.8229e-15 9.4489e-19 -7.6342e-23 );
+    }
+    thermodynamics
+    {
         Hf              -13424600;
         Sf              10475.4;
-    rhoCoeffs<8>    ( 2.3302 -0.0093477 1.8601e-05 -2.0524e-08 1.3119e-11 -4.8229e-15 9.4489e-19 -7.6342e-23 );
         CpCoeffs<8>     ( 1570.5 1.6886 -0.0039382 6.2482e-06 -4.9342e-09 2.0513e-12 -4.3361e-16 3.6812e-20 );
+    }
+    transport
+    {
         muCoeffs<8> ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
         kappaCoeffs<8>  ( 0.0069975 0.00013726 8.6579e-09 -7.1514e-12 8.441e-16 0 0 0 );
     }
+}
 
 CH4
+{
+    specie
     {
         nMoles          1;
         molWeight       16.043;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 2.0751 -0.0083243 1.6564e-05 -1.8277e-08 1.1683e-11 -4.2949e-15 8.4144e-19 -6.7984e-23 );
+    }
+    thermodynamics
+    {
         Hf              -4.66836e+06;
         Sf              11597.7;
-    rhoCoeffs<8>    ( 2.0751 -0.0083243 1.6564e-05 -1.8277e-08 1.1683e-11 -4.2949e-15 8.4144e-19 -6.7984e-23 );
         CpCoeffs<8>     ( 996.92 4.0854 -0.00092999 1.957e-06 -2.9777e-09 1.7459e-12 -4.5594e-16 4.4774e-20 );
+    }
+    transport
+    {
         muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
         kappaCoeffs<8>  ( -0.018501 0.00021332 1.4678e-07 -7.7129e-11 1.0936e-14 0 0 0 );
     }
+}
 
 CO2
+{
+    specie
     {
         nMoles          1;
         molWeight       44.01;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 5.6924 -0.022836 4.544e-05 -5.014e-08 3.2048e-11 -1.1782e-14 2.3083e-18 -1.865e-22 );
+    }
+    thermodynamics
+    {
         Hf              -8.9423e+06;
         Sf              4856.6;
-    rhoCoeffs<8>    ( 5.6924 -0.022836 4.544e-05 -5.014e-08 3.2048e-11 -1.1782e-14 2.3083e-18 -1.865e-22 );
         CpCoeffs<8>     ( 462.23 1.5803 -0.0010515 7.4618e-08 3.216e-10 -1.9646e-13 4.7679e-17 -4.3027e-21 );
+    }
+    transport
+    {
         muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
         kappaCoeffs<8>  ( -0.0076857 0.00010773 -2.7043e-08 4.4967e-12 -3.0218e-16 0 0 0 );
     }
+}
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 3.6234 -0.014535 2.8924e-05 -3.1915e-08 2.0399e-11 -7.4994e-15 1.4693e-18 -1.1871e-22 );
+    }
+    thermodynamics
+    {
         Hf              51.2816;
         Sf              6836.49;
-    rhoCoeffs<8>    ( 3.6234 -0.014535 2.8924e-05 -3.1915e-08 2.0399e-11 -7.4994e-15 1.4693e-18 -1.1871e-22 );
         CpCoeffs<8>     ( 1049.8 -0.16537 0.00036105 2.0824e-07 -5.3568e-10 3.2274e-13 -8.3335e-17 8.054e-21 );
+    }
+    transport
+    {
         muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
         kappaCoeffs<8>  ( 0.0028213 8.6668e-05 -1.5148e-08 1.2499e-12 3.1675e-17 0 0 0 );
     }
+}
 
 
 // ************************************************************************* //

tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly

@@ -16,40 +16,76 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              0;
-    rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
         CpCoeffs<8>     ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
         kappaCoeffs<8>  ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              -13423000;
         Sf              10482;
-    rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
         CpCoeffs<8>     ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
         kappaCoeffs<8>  ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
     }
+}
 
 air
+{
+    specie
     {
         nMoles          1;
         molWeight       28.85;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              0;
-    rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
         CpCoeffs<8>     ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>     ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
         kappaCoeffs<8>  ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
     }
+}
 
 
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat

@@ -16,82 +16,136 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 CO2
+{
+    specie
     {
         nMoles          1;
         molWeight       44.01;
+    }
+    thermodynamics
+    {
         Tlow            0;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.85746 0.00441437 -2.21481e-06 5.2349e-10 -4.72084e-14 -48759.2 2.27164 );
         lowCpCoeffs     ( 2.35677 0.0089846 -7.12356e-06 2.45919e-09 -1.437e-13 -48372 9.90105 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.6;
     }
+}
 
 CH4
+{
+    specie
     {
         nMoles          1;
         molWeight       16.043;
+    }
+    thermodynamics
+    {
         Tlow            0;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 0.0748515 0.0133909 -5.73286e-06 1.22293e-09 -1.01815e-13 -9468.34 18.4373 );
         lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84743e-08 1.66694e-11 -10246.6 -4.6413 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 H2
+{
+    specie
     {
         nMoles          1;
         molWeight       2.01594;
+    }
+    thermodynamics
+    {
         Tlow            0;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.33728 -4.94025e-05 4.99457e-07 -1.79566e-10 2.00255e-14 -950.159 -3.20502 );
         lowCpCoeffs     ( 2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    thermodynamics
+    {
         Tlow            0;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.03399 0.00217692 -1.64073e-07 -9.7042e-11 1.68201e-14 -30004.3 4.96677 );
         lowCpCoeffs     ( 4.19864 -0.00203643 6.5204e-06 -5.48797e-09 1.77198e-12 -30293.7 -0.849032 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 O2
+{
+    specie
     {
         nMoles          1;
         molWeight       31.9988;
+    }
+    thermodynamics
+    {
         Tlow            0;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.28254 0.00148309 -7.57967e-07 2.09471e-10 -2.16718e-14 -1088.46 5.45323 );
         lowCpCoeffs     ( 3.78246 -0.00299673 9.8473e-06 -9.6813e-09 3.24373e-12 -1063.94 3.65768 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    thermodynamics
+    {
         Tlow            0;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
         lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44485e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly

@@ -16,52 +16,100 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              0;
-    rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
         CpCoeffs<8>    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
         kappaCoeffs<8> ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
     }
+}
 
 O2
+{
+    specie
     {
         nMoles          1;
         molWeight       31.9988;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              0;
-    rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
         CpCoeffs<8>    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
         kappaCoeffs<8> ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              -13423000;
         Sf              10482;
-    rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
         CpCoeffs<8>    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
         kappaCoeffs<8> ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
     }
+}
 
 air
+{
+    specie
     {
         nMoles          1;
         molWeight       28.85;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              0;
-    rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
         CpCoeffs<8>    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
         kappaCoeffs<8> ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
     }
+}
 
 
 // ************************************************************************* //

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly

@@ -16,52 +16,100 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              0;
-    rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
         CpCoeffs<8>    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
         kappaCoeffs<8> ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
     }
+}
 
 O2
+{
+    specie
     {
         nMoles          1;
         molWeight       31.9988;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              0;
-    rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
         CpCoeffs<8>    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
         kappaCoeffs<8> ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              -13423000;
         Sf              10482;
-    rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
         CpCoeffs<8>    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
         kappaCoeffs<8> ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
     }
+}
 
 air
+{
+    specie
     {
         nMoles          1;
         molWeight       28.85;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              0;
-    rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
         CpCoeffs<8>    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
         kappaCoeffs<8> ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
     }
+}
 
 
 // ************************************************************************* //

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly

@@ -16,40 +16,76 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              0;
-    rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
         CpCoeffs<8>     ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
         kappaCoeffs<8>  ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              -13423000;
         Sf              10482;
-    rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
         CpCoeffs<8>     ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
         kappaCoeffs<8>  ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
     }
+}
 
 air
+{
+    specie
     {
         nMoles          1;
         molWeight       28.85;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    }
+    thermodynamics
+    {
         Hf              0;
         Sf              0;
-    rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
         CpCoeffs<8>     ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    }
+    transport
+    {
         muCoeffs<8>     ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
         kappaCoeffs<8>  ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
     }
+}
 
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat

@@ -16,43 +16,70 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 O2
+{
+    specie
     {
         nMoles          1;
         molWeight       31.9988;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
         lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
         lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
         lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/parcelInjectionProperties

@@ -14,7 +14,7 @@ FoamFile
     object      scalarListList;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
+// (x y z) (u v w) d rho mDot T Cp (Y0..Y2)
 (
     (0 1.95 -0.2) (0 -5 0) 0.001 1000 0.002 300 4200 (1)
     (0 1.95    0) (0 -5 0) 0.001 1000 0.002 300 4200 (1)

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat

@@ -16,43 +16,70 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 O2
+{
+    specie
     {
         nMoles          1;
         molWeight       31.9988;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
         lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
         lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
         lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat

@@ -16,43 +16,70 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 O2
+{
+    specie
     {
         nMoles          1;
         molWeight       31.9988;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
         lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
         lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
         lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.dat

@@ -16,43 +16,70 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 O2
+{
+    specie
     {
         nMoles          1;
         molWeight       31.9988;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
         lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 H2O
+{
+    specie
     {
         nMoles          1;
         molWeight       18.0153;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
         lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 N2
+{
+    specie
     {
         nMoles          1;
         molWeight       28.0134;
+    }
+    thermodynamics
+    {
         Tlow            200;
         Thigh           5000;
         Tcommon         1000;
         highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
         lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
         As              1.67212e-06;
         Ts              170.672;
     }
+}
 
 
 // ************************************************************************* //