diff --git a/ReleaseNotes-dev b/ReleaseNotes-dev
index d35d1b518e..12aa0ed485 100644
--- a/ReleaseNotes-dev
+++ b/ReleaseNotes-dev
@@ -29,13 +29,29 @@
   =metis-5.0pre2=, =ParMetis-3.1= and =ParMGridGen-1.0=.
 
 * Library developments
+
   There have been a number of developments to the libraries to support the
   extension of functionality in solver and utility applications.
 *** Core library
     + Large number of code refinements and consistency improvements to support
       other developments.
 *** Turbulence modelling
-*** Thermo-physical Models
+*** *Updated* thermophysical libraries
+    + Now use the more descriptive dictionary input format, e.g. for a single
+      component mixture:
+
+    thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+
+    mixture
+    {
+        nMoles      1;
+        molWeight   28.9;
+        Cp          1007;
+        Hf          0;
+        As          1.4792e-06;
+        Ts          116;
+    }
+
 *** DSMC
 *** Dynamic Mesh
 *** Numerics
@@ -67,8 +83,10 @@
     + Additional wall functions for primary region momentum and temperature
       taking film into account
     + Parallel aware
+*** *New* ptscotch decomposition method
 *** *Updated* particle tracking algorithm
-
+*** *Updated* split cyclics into two separate patches. See doc/changed/splitCyclics.txt
+*** *New* compact binary I/O for faces and cells. This speeds up reading/writing meshes in binary.
 * Solvers
   A number of new solvers have been developed for a range of engineering
   applications.  There has been a set of improvements to certain classes of
@@ -108,10 +126,12 @@
       + extrudes into master direction (i.e. away from the owner cell
         if flipMap is false)
 *** Updated utilities
-    + ...
-
+    + =setFields=: optionally use faceSets to set patch values (see e.g. hotRoom tutorial).
+    + =blockMesh=: specify patches via dictionary instead of type only. This
+      makes rereading the boundary superfluous. see
+      e.g. pitzDailyDirectMapped tutorial.
 * Post-processing
-  + =foamToEnsight=: new =-nodeValues= option to generate and output nodal
+  + =foamToEnsight=: parallel continuous data. new =-nodeValues= option to generate and output nodal
     field data.
   + Function objects:
     + =residualControl=: new function object to allow users to terminate steady
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C
index a298c4207d..827449c02c 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCells.C
+++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C
@@ -55,6 +55,7 @@ Description
 #include "edgeStats.H"
 #include "treeDataTriSurface.H"
 #include "indexedOctree.H"
+#include "globalMeshData.H"
 
 using namespace Foam;
 
@@ -298,7 +299,7 @@ label selectOutsideCells
         mesh,
         outsideFaces.shrink(),
         outsideFacesInfo.shrink(),
-        mesh.nCells()  // max iterations
+        mesh.globalData().nTotalCells()+1  // max iterations
     );
 
     // Now regionCalc should hold info on cells that are reachable from
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 5fd94ef38d..6f0f7c976d 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -43,7 +43,7 @@ Description
 #include "polyMeshZipUpCells.H"
 #include "wallPolyPatch.H"
 #include "symmetryPolyPatch.H"
-#include "cyclicPolyPatch.H"
+#include "oldCyclicPolyPatch.H"
 #include "Swap.H"
 #include "IFstream.H"
 #include "readHexLabel.H"
@@ -900,7 +900,7 @@ int main(int argc, char *argv[])
     fluentToFoamType.insert("interface", polyPatch::typeName);
     fluentToFoamType.insert("internal", polyPatch::typeName);
     fluentToFoamType.insert("solid", polyPatch::typeName);
-    fluentToFoamType.insert("fan", cyclicPolyPatch::typeName);
+    fluentToFoamType.insert("fan", oldCyclicPolyPatch::typeName);
     fluentToFoamType.insert("radiator", polyPatch::typeName);
     fluentToFoamType.insert("porous-jump", polyPatch::typeName);
 
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index ab764547a3..066fab386f 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -41,7 +41,7 @@ Description
 #include "wallPolyPatch.H"
 #include "symmetryPolyPatch.H"
 #include "wedgePolyPatch.H"
-#include "cyclicPolyPatch.H"
+#include "oldCyclicPolyPatch.H"
 #include "unitConversion.H"
 
 using namespace Foam;
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 04b36020ea..1a559559e9 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -196,7 +196,7 @@ const word* kivaPatchTypes[nBCs] =
     &polyPatch::typeName,
     &polyPatch::typeName,
     &symmetryPolyPatch::typeName,
-    &cyclicPolyPatch::typeName
+    &oldCyclicPolyPatch::typeName
 };
 
 enum patchTypeNames
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
index 53dffd39c6..d01a114111 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
@@ -29,7 +29,7 @@ Description
 #include "sammMesh.H"
 #include "Time.H"
 #include "wallPolyPatch.H"
-#include "cyclicPolyPatch.H"
+#include "oldCyclicPolyPatch.H"
 #include "symmetryPolyPatch.H"
 #include "preservePatchTypes.H"
 #include "IFstream.H"
@@ -208,7 +208,7 @@ void sammMesh::readBoundary()
             {
                 // incorrect. should be cyclicPatch but this
                 // requires info on connected faces.
-                patchTypes_[patchLabel] = cyclicPolyPatch::typeName;
+                patchTypes_[patchLabel] = oldCyclicPolyPatch::typeName;
             }
             else
             {
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
index a96ee6e96b..75a1860006 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
@@ -29,7 +29,7 @@ Description
 #include "starMesh.H"
 #include "Time.H"
 #include "wallPolyPatch.H"
-#include "cyclicPolyPatch.H"
+#include "oldCyclicPolyPatch.H"
 #include "symmetryPolyPatch.H"
 #include "preservePatchTypes.H"
 #include "IFstream.H"
@@ -206,7 +206,7 @@ void starMesh::readBoundary()
             {
                 // incorrect. should be cyclicPatch but this
                 // requires info on connected faces.
-                patchTypes_[patchLabel] = cyclicPolyPatch::typeName;
+                patchTypes_[patchLabel] = oldCyclicPolyPatch::typeName;
             }
             else
             {
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index 3c224d318f..b7fd6d3bd2 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -11,7 +11,7 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -ldecompositionMethods \
-    -L$(FOAM_MPI_LIBBIN) -lptscotchDecomp \
+    -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
     -lmeshTools \
     -ldynamicMesh \
     -lautoMesh
diff --git a/applications/utilities/mesh/manipulation/createBaffles/SetPatchFields.C b/applications/utilities/mesh/manipulation/createBaffles/SetPatchFields.C
new file mode 100644
index 0000000000..25de86d62f
--- /dev/null
+++ b/applications/utilities/mesh/manipulation/createBaffles/SetPatchFields.C
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+     \\/     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 "SetPatchFields.H"
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+template<class GeoField>
+void Foam::SetPatchFields
+(
+    PtrList<GeoField>& fields,
+    const label patchI,
+    const typename GeoField::value_type& initVal
+)
+{
+    forAll(fields, i)
+    {
+        typename GeoField::PatchFieldType& pfld =
+            fields[i].boundaryField()[patchI];
+        pfld == initVal;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/setHotRoom.C b/applications/utilities/mesh/manipulation/createBaffles/SetPatchFields.H
similarity index 51%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/setHotRoom.C
rename to applications/utilities/mesh/manipulation/createBaffles/SetPatchFields.H
index 73cb4df097..1dcb1e346a 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/setHotRoom.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/SetPatchFields.H
@@ -21,73 +21,46 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Application
-    setHotRoom
+Global
+    Foam::SetPatchFields
 
 Description
-    Set the initial field of T for the hot room problem.
+    Helper routine to initialise a patch field to a constant value
+
+SourceFiles
+    SetPatchFields.C
 
 \*---------------------------------------------------------------------------*/
 
-#include "fvCFD.H"
-#include "OSspecific.H"
-#include "fixedValueFvPatchFields.H"
+#ifndef SetPatchFields_H
+#define SetPatchFields_H
+
+#include "PtrList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-int main(int argc, char *argv[])
+namespace Foam
 {
 
-#   include "setRootCase.H"
+//- Helper routine to read fields
+template<class GeoField>
+void SetPatchFields
+(
+    PtrList<GeoField>& fields,
+    const label patchI,
+    const typename GeoField::value_type& initVal
+);
 
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "createFields.H"
+} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-volScalarField::GeometricBoundaryField& Tpatches = T.boundaryField();
+#ifdef NoRepository
+#   include "SetPatchFields.C"
+#endif
 
-forAll(Tpatches, patchI)
-{
-    if
-    (
-        isA<fixedValueFvPatchScalarField>(Tpatches[patchI])
-     && mesh.boundaryMesh()[patchI].name() == "floor"
-    )
-    {
-        fixedValueFvPatchScalarField& Tpatch =
-            refCast<fixedValueFvPatchScalarField>(Tpatches[patchI]);
-        
-        const vectorField& faceCentres = 
-            mesh.Cf().boundaryField()[patchI];
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-        forAll(faceCentres, facei)
-        {
-            if 
-            (
-                (faceCentres[facei].x() > 4.5) && 
-                (faceCentres[facei].x() < 5.5) && 
-                (faceCentres[facei].z() > 4.5) && 
-                (faceCentres[facei].z() < 5.5) 
-            )
-            {
-                Tpatch[facei] = 600;
-            }
-            else
-            {
-                Tpatch[facei] = 300;
-            }
-        }
-    };
+#endif
 
-    Info<< "Writing modified field T\n" << endl;
-    T.write();
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-}
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index f01c2cd602..a94dc42144 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -43,6 +43,8 @@ Description
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "ZoneIDs.H"
+#include "fvMeshMapper.H"
+#include "SetPatchFields.H"
 
 using namespace Foam;
 
@@ -241,45 +243,39 @@ int main(int argc, char *argv[])
     IOobjectList objects(mesh, runTime.timeName());
 
     // Read vol fields.
-    if (args.optionFound("updateFields"))
-    {
-        Info<< "Reading geometric fields" << nl << endl;
-        PtrList<volScalarField> vsFlds;
-        ReadFields(mesh, objects, vsFlds);
+    Info<< "Reading geometric fields" << nl << endl;
+    PtrList<volScalarField> vsFlds;
+    ReadFields(mesh, objects, vsFlds);
 
-        PtrList<volVectorField> vvFlds;
-        ReadFields(mesh, objects, vvFlds);
+    PtrList<volVectorField> vvFlds;
+    ReadFields(mesh, objects, vvFlds);
 
-        PtrList<volSphericalTensorField> vstFlds;
-        ReadFields(mesh, objects, vstFlds);
+    PtrList<volSphericalTensorField> vstFlds;
+    ReadFields(mesh, objects, vstFlds);
 
-        PtrList<volSymmTensorField> vsymtFlds;
-        ReadFields(mesh, objects, vsymtFlds);
+    PtrList<volSymmTensorField> vsymtFlds;
+    ReadFields(mesh, objects, vsymtFlds);
 
-        PtrList<volTensorField> vtFlds;
-        ReadFields(mesh, objects, vtFlds);
+    PtrList<volTensorField> vtFlds;
+    ReadFields(mesh, objects, vtFlds);
 
-        // Read surface fields.
+    // Read surface fields.
 
-        PtrList<surfaceScalarField> ssFlds;
-        ReadFields(mesh, objects, ssFlds);
+    PtrList<surfaceScalarField> ssFlds;
+    ReadFields(mesh, objects, ssFlds);
 
-        PtrList<surfaceVectorField> svFlds;
-        ReadFields(mesh, objects, svFlds);
+    PtrList<surfaceVectorField> svFlds;
+    ReadFields(mesh, objects, svFlds);
 
-        PtrList<surfaceSphericalTensorField> sstFlds;
-        ReadFields(mesh, objects, sstFlds);
+    PtrList<surfaceSphericalTensorField> sstFlds;
+    ReadFields(mesh, objects, sstFlds);
 
-        PtrList<surfaceSymmTensorField> ssymtFlds;
-        ReadFields(mesh, objects, ssymtFlds);
+    PtrList<surfaceSymmTensorField> ssymtFlds;
+    ReadFields(mesh, objects, ssymtFlds);
+
+    PtrList<surfaceTensorField> stFlds;
+    ReadFields(mesh, objects, stFlds);
 
-        PtrList<surfaceTensorField> stFlds;
-        ReadFields(mesh, objects, stFlds);
-    }
-    else
-    {
-        Info<< "Not updating geometric fields" << nl << endl;
-    }
 
     // Mesh change container
     polyTopoChange meshMod(mesh);
@@ -484,6 +480,58 @@ int main(int argc, char *argv[])
     // Update fields
     mesh.updateMesh(map);
 
+    // Correct boundary faces mapped-out-of-nothing.
+    {
+        fvMeshMapper mapper(mesh, map);
+        bool hasWarned = false;
+        forAll(newMasterPatches, i)
+        {
+            label patchI = newMasterPatches[i];
+            const fvPatchMapper& pm = mapper.boundaryMap()[patchI];
+            if (pm.sizeBeforeMapping() == 0)
+            {
+                if (!hasWarned)
+                {
+                    hasWarned = true;
+                    WarningIn(args.executable())
+                        << "Setting field on boundary faces to zero." << endl
+                        << "You might have to edit these fields." << endl;
+                }
+
+                SetPatchFields(vsFlds, patchI, pTraits<scalar>::zero);
+                SetPatchFields(vvFlds, patchI, pTraits<vector>::zero);
+                SetPatchFields(vstFlds, patchI, pTraits<sphericalTensor>::zero);
+                SetPatchFields(vsymtFlds, patchI, pTraits<symmTensor>::zero);
+                SetPatchFields(vtFlds, patchI, pTraits<tensor>::zero);
+
+                SetPatchFields(ssFlds, patchI, pTraits<scalar>::zero);
+                SetPatchFields(svFlds, patchI, pTraits<vector>::zero);
+                SetPatchFields(sstFlds, patchI, pTraits<sphericalTensor>::zero);
+                SetPatchFields(ssymtFlds, patchI, pTraits<symmTensor>::zero);
+                SetPatchFields(stFlds, patchI, pTraits<tensor>::zero);
+            }
+        }
+        forAll(newSlavePatches, i)
+        {
+            label patchI = newSlavePatches[i];
+            const fvPatchMapper& pm = mapper.boundaryMap()[patchI];
+            if (pm.sizeBeforeMapping() == 0)
+            {
+                SetPatchFields(vsFlds, patchI, pTraits<scalar>::zero);
+                SetPatchFields(vvFlds, patchI, pTraits<vector>::zero);
+                SetPatchFields(vstFlds, patchI, pTraits<sphericalTensor>::zero);
+                SetPatchFields(vsymtFlds, patchI, pTraits<symmTensor>::zero);
+                SetPatchFields(vtFlds, patchI, pTraits<tensor>::zero);
+
+                SetPatchFields(ssFlds, patchI, pTraits<scalar>::zero);
+                SetPatchFields(svFlds, patchI, pTraits<vector>::zero);
+                SetPatchFields(sstFlds, patchI, pTraits<sphericalTensor>::zero);
+                SetPatchFields(ssymtFlds, patchI, pTraits<symmTensor>::zero);
+                SetPatchFields(stFlds, patchI, pTraits<tensor>::zero);
+            }
+        }
+    }
+
     // Move mesh (since morphing might not do this)
     if (map().hasMotionPoints())
     {
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/Make/options b/applications/utilities/mesh/manipulation/subsetMesh/Make/options
index d27c95d033..969020c4af 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/subsetMesh/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lmeshTools
+    -lmeshTools \
+    -lgenericPatchFields
diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options
index 3ae2128234..7a9f1df3f5 100644
--- a/applications/utilities/parallelProcessing/decomposePar/Make/options
+++ b/applications/utilities/parallelProcessing/decomposePar/Make/options
@@ -7,6 +7,6 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -lgenericPatchFields \
-    -ldecompositionMethods -lmetisDecomp -lscotchDecomp \
+    -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp \
     -llagrangian \
     -lmeshTools
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
index 505234515d..05d603887a 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
@@ -7,6 +7,6 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -ldecompositionMethods \
-    -L$(FOAM_MPI_LIBBIN) -lptscotchDecomp \
+    -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
     -lmeshTools \
     -ldynamicMesh
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/cellSets.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/cellSets.H
index 86eaa03d88..ff358d7887 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/cellSets.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/cellSets.H
@@ -57,7 +57,6 @@ public:
         labelList prisms;
         labelList wedges;
         labelList hexes;
-        labelList hexesWedges;
         labelList polys;
 
 
@@ -77,7 +76,6 @@ public:
             prisms(nCells),
             wedges(nCells),
             hexes(nCells),
-            hexesWedges(nCells),
             polys(nCells)
         {}
 };
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index 8a79f54d96..5434209711 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -38,6 +38,32 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
+template<class Type>
+Field<Type> map
+(
+    const Field<Type>& vf,
+    const labelList& map1,
+    const labelList& map2
+)
+{
+    Field<Type> mf(map1.size() + map2.size());
+
+    forAll(map1, i)
+    {
+        mf[i] = vf[map1[i]];
+    }
+
+    label offset = map1.size();
+
+    forAll(map2, i)
+    {
+        mf[i + offset] = vf[map2[i]];
+    }
+
+    return mf;
+}
+
+
 template<class Type>
 void writeField
 (
@@ -274,7 +300,8 @@ void ensightField
     const labelList& tets = meshCellSets.tets;
     const labelList& pyrs = meshCellSets.pyrs;
     const labelList& prisms = meshCellSets.prisms;
-    const labelList& hexesWedges = meshCellSets.hexesWedges;
+    const labelList& wedges = meshCellSets.wedges;
+    const labelList& hexes = meshCellSets.hexes;
     const labelList& polys = meshCellSets.polys;
 
     ensightStream* ensightFilePtr = NULL;
@@ -328,7 +355,7 @@ void ensightField
         writeField
         (
             "hexa8",
-            Field<Type>(vf, hexesWedges),
+            map(vf, hexes, wedges),
             ensightFile
         );
 
@@ -548,99 +575,99 @@ void ensightPointField
     }
 
 
-     label ensightPatchI = eMesh.patchPartOffset();
+    label ensightPatchI = eMesh.patchPartOffset();
  
-     forAll(allPatchNames, patchi)
-     {
-         const word& patchName = allPatchNames[patchi];
+    forAll(allPatchNames, patchi)
+    {
+        const word& patchName = allPatchNames[patchi];
  
-         eMesh.barrier();
+        eMesh.barrier();
  
-         if (patchNames.empty() || patchNames.found(patchName))
-         {
-             const fvPatch& p = mesh.boundary()[patchi];
-             if
-             (
-                 returnReduce(p.size(), sumOp<label>())
-               > 0
-             )
-             {
-                 // Renumber the patch points/faces into unique points
-                 labelList pointToGlobal;
-                 labelList uniqueMeshPointLabels;
-                 autoPtr<globalIndex> globalPointsPtr =
-                 mesh.globalData().mergePoints
-                 (
-                     p.patch().meshPoints(),
-                     p.patch().meshPointMap(),
-                     pointToGlobal,
-                     uniqueMeshPointLabels
-                 );
+        if (patchNames.empty() || patchNames.found(patchName))
+        {
+            const fvPatch& p = mesh.boundary()[patchi];
+            if
+            (
+                returnReduce(p.size(), sumOp<label>())
+              > 0
+            )
+            {
+                // Renumber the patch points/faces into unique points
+                labelList pointToGlobal;
+                labelList uniqueMeshPointLabels;
+                autoPtr<globalIndex> globalPointsPtr =
+                mesh.globalData().mergePoints
+                (
+                    p.patch().meshPoints(),
+                    p.patch().meshPointMap(),
+                    pointToGlobal,
+                    uniqueMeshPointLabels
+                );
  
-                 if (Pstream::master())
-                 {
-                     ensightFile.writePartHeader(ensightPatchI);
-                 }
+                if (Pstream::master())
+                {
+                    ensightFile.writePartHeader(ensightPatchI);
+                }
  
-                 writeField
-                 (
-                     "coordinates",
-                     Field<Type>(pf.internalField(), uniqueMeshPointLabels),
-                     ensightFile
-                 );
+                writeField
+                (
+                    "coordinates",
+                    Field<Type>(pf.internalField(), uniqueMeshPointLabels),
+                    ensightFile
+                );
  
-                 ensightPatchI++;
-             }
-         }
-     }
+                ensightPatchI++;
+            }
+        }
+    }
  
-     // write faceZones, if requested
-     if (faceZoneNames.size())
-     {
-         forAllConstIter(wordHashSet, faceZoneNames, iter)
-         {
-             const word& faceZoneName = iter.key();
- 
-             eMesh.barrier();
- 
-             label zoneID = mesh.faceZones().findZoneID(faceZoneName);
- 
-             const faceZone& fz = mesh.faceZones()[zoneID];
- 
-             if (returnReduce(fz().nPoints(), sumOp<label>()) > 0)
-             {
-                 // Renumber the faceZone points/faces into unique points
-                 labelList pointToGlobal;
-                 labelList uniqueMeshPointLabels;
-                 autoPtr<globalIndex> globalPointsPtr =
-                 mesh.globalData().mergePoints
-                 (
-                     fz().meshPoints(),
-                     fz().meshPointMap(),
-                     pointToGlobal,
-                     uniqueMeshPointLabels
-                 );
- 
-                 if (Pstream::master())
-                 {
-                     ensightFile.writePartHeader(ensightPatchI);
-                 }
- 
-                 writeField
-                 (
-                     "coordinates",
-                     Field<Type>
-                     (
-                         pf.internalField(),
-                         uniqueMeshPointLabels
-                     ),
-                     ensightFile
-                 );
- 
-                 ensightPatchI++;
-             }
-         }
-     }
+    // write faceZones, if requested
+    if (faceZoneNames.size())
+    {
+        forAllConstIter(wordHashSet, faceZoneNames, iter)
+        {
+            const word& faceZoneName = iter.key();
+
+            eMesh.barrier();
+
+            label zoneID = mesh.faceZones().findZoneID(faceZoneName);
+
+            const faceZone& fz = mesh.faceZones()[zoneID];
+
+            if (returnReduce(fz().nPoints(), sumOp<label>()) > 0)
+            {
+                // Renumber the faceZone points/faces into unique points
+                labelList pointToGlobal;
+                labelList uniqueMeshPointLabels;
+                autoPtr<globalIndex> globalPointsPtr =
+                mesh.globalData().mergePoints
+                (
+                    fz().meshPoints(),
+                    fz().meshPointMap(),
+                    pointToGlobal,
+                    uniqueMeshPointLabels
+                );
+
+                if (Pstream::master())
+                {
+                    ensightFile.writePartHeader(ensightPatchI);
+                }
+
+                writeField
+                (
+                    "coordinates",
+                    Field<Type>
+                    (
+                        pf.internalField(),
+                        uniqueMeshPointLabels
+                    ),
+                    ensightFile
+                );
+
+                ensightPatchI++;
+            }
+        }
+    }
 
     if (Pstream::master())
     {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index 6216228961..77fb706d56 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -70,12 +70,15 @@ void Foam::ensightMesh::correct()
         // Patches are output. Check that they're synced.
         mesh_.boundaryMesh().checkParallelSync(true);
 
-        allPatchNames_ = wordList::subList
-        (
-            mesh_.boundaryMesh().names(),
-            mesh_.boundary().size()
-          - mesh_.globalData().processorPatches().size()
-        );
+        allPatchNames_ = mesh_.boundaryMesh().names();
+        if (Pstream::parRun())
+        {
+            allPatchNames_.setSize
+            (
+                mesh_.boundary().size()
+              - mesh_.globalData().processorPatches().size()
+            );
+        }
 
         if (patches_)
         {
@@ -114,7 +117,6 @@ void Foam::ensightMesh::correct()
         labelList& prisms = meshCellSets_.prisms;
         labelList& wedges = meshCellSets_.wedges;
         labelList& hexes = meshCellSets_.hexes;
-        labelList& hexesWedges = meshCellSets_.hexesWedges;
         labelList& polys = meshCellSets_.polys;
 
         label nTets = 0;
@@ -122,7 +124,6 @@ void Foam::ensightMesh::correct()
         label nPrisms = 0;
         label nWedges = 0;
         label nHexes = 0;
-        label nHexesWedges = 0;
         label nPolys = 0;
 
         forAll(cellShapes, cellI)
@@ -145,12 +146,10 @@ void Foam::ensightMesh::correct()
             else if (cellModel == wedge)
             {
                 wedges[nWedges++] = cellI;
-                hexesWedges[nHexesWedges++] = cellI;
             }
             else if (cellModel == hex)
             {
                 hexes[nHexes++] = cellI;
-                hexesWedges[nHexesWedges++] = cellI;
             }
             else
             {
@@ -163,7 +162,6 @@ void Foam::ensightMesh::correct()
         prisms.setSize(nPrisms);
         wedges.setSize(nWedges);
         hexes.setSize(nHexes);
-        hexesWedges.setSize(nHexesWedges);
         polys.setSize(nPolys);
 
         meshCellSets_.nTets = nTets;
@@ -175,7 +173,7 @@ void Foam::ensightMesh::correct()
         meshCellSets_.nPrisms = nPrisms;
         reduce(meshCellSets_.nPrisms, sumOp<label>());
 
-        meshCellSets_.nHexesWedges = nHexesWedges;
+        meshCellSets_.nHexesWedges = nWedges+nHexes;
         reduce(meshCellSets_.nHexesWedges, sumOp<label>());
 
         meshCellSets_.nPolys = nPolys;
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index 55b58e16b4..797b44437e 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    Selects a cell set through a dictionary.
+    Set values on a selected set of cells/patchfaces through a dictionary.
 
 \*---------------------------------------------------------------------------*/
 
@@ -32,12 +32,13 @@ Description
 #include "fvMesh.H"
 #include "topoSetSource.H"
 #include "cellSet.H"
+#include "faceSet.H"
 #include "volFields.H"
 
 using namespace Foam;
 
 template<class Type>
-bool setFieldType
+bool setCellFieldType
 (
     const word& fieldTypeDesc,
     const fvMesh& mesh,
@@ -65,7 +66,8 @@ bool setFieldType
     // Check field exists
     if (fieldHeader.headerOk())
     {
-        Info<< "    Setting " << fieldHeader.headerClassName()
+        Info<< "    Setting internal values of "
+            << fieldHeader.headerClassName()
             << " " << fieldName << endl;
 
         fieldType field(fieldHeader, mesh);
@@ -96,7 +98,7 @@ bool setFieldType
     {
         WarningIn
         (
-            "void setFieldType"
+            "void setCellFieldType"
             "(const fvMesh& mesh, const labelList& selectedCells,"
             "Istream& fieldValueStream)"
         ) << "Field " << fieldName << " not found" << endl;
@@ -106,17 +108,17 @@ bool setFieldType
 }
 
 
-class setField
+class setCellField
 {
 
 public:
 
-    setField()
+    setCellField()
     {}
 
-    autoPtr<setField> clone() const
+    autoPtr<setCellField> clone() const
     {
-        return autoPtr<setField>(new setField());
+        return autoPtr<setCellField>(new setCellField());
     }
 
     class iNew
@@ -132,37 +134,200 @@ public:
             selectedCells_(selectedCells)
         {}
 
-        autoPtr<setField> operator()(Istream& fieldValues) const
+        autoPtr<setCellField> operator()(Istream& fieldValues) const
         {
             word fieldType(fieldValues);
 
             if
             (
                !(
-                    setFieldType<scalar>
+                    setCellFieldType<scalar>
                         (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setFieldType<vector>
+                 || setCellFieldType<vector>
                         (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setFieldType<sphericalTensor>
+                 || setCellFieldType<sphericalTensor>
                         (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setFieldType<symmTensor>
+                 || setCellFieldType<symmTensor>
                         (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setFieldType<tensor>
+                 || setCellFieldType<tensor>
                         (fieldType, mesh_, selectedCells_, fieldValues)
                 )
             )
             {
-                WarningIn("setField::iNew::operator()(Istream& is)")
+                WarningIn("setCellField::iNew::operator()(Istream& is)")
                     << "field type " << fieldType << " not currently supported"
                     << endl;
             }
 
-            return autoPtr<setField>(new setField());
+            return autoPtr<setCellField>(new setCellField());
         }
     };
 };
 
 
+template<class Type>
+bool setFaceFieldType
+(
+    const word& fieldTypeDesc,
+    const fvMesh& mesh,
+    const labelList& selectedFaces,
+    Istream& fieldValueStream
+)
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
+    if (fieldTypeDesc != fieldType::typeName + "Value")
+    {
+        return false;
+    }
+
+    word fieldName(fieldValueStream);
+
+    IOobject fieldHeader
+    (
+        fieldName,
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ
+    );
+
+    // Check field exists
+    if (fieldHeader.headerOk())
+    {
+        Info<< "    Setting patchField values of "
+            << fieldHeader.headerClassName()
+            << " " << fieldName << endl;
+
+        fieldType field(fieldHeader, mesh);
+
+        const Type& value = pTraits<Type>(fieldValueStream);
+
+        // Create flat list of selected faces and their value.
+        Field<Type> allBoundaryValues(mesh.nFaces()-mesh.nInternalFaces());
+        forAll(field.boundaryField(), patchi)
+        {
+            SubField<Type>
+            (
+                allBoundaryValues,
+                field.boundaryField()[patchi].size(),
+                field.boundaryField()[patchi].patch().start()
+              - mesh.nInternalFaces()
+            ).assign(field.boundaryField()[patchi]);
+        }
+
+        // Override
+        labelList nChanged(field.boundaryField().size(), 0);
+        forAll(selectedFaces, i)
+        {
+            label facei = selectedFaces[i];
+            if (mesh.isInternalFace(facei))
+            {
+                WarningIn("setFaceFieldType(..)")
+                    << "Ignoring internal face " << facei << endl;
+            }
+            else
+            {
+                label bFaceI = facei-mesh.nInternalFaces();
+                allBoundaryValues[bFaceI] = value;
+                nChanged[mesh.boundaryMesh().patchID()[bFaceI]]++;
+            }
+        }
+
+        Pstream::listCombineGather(nChanged, plusEqOp<label>());
+        Pstream::listCombineScatter(nChanged);
+
+        // Reassign.
+        forAll(field.boundaryField(), patchi)
+        {
+            if (nChanged[patchi] > 0)
+            {
+                Info<< "    On patch "
+                    << field.boundaryField()[patchi].patch().name()
+                    << " set " << nChanged[patchi] << " values" << endl;
+                field.boundaryField()[patchi] == SubField<Type>
+                (
+                    allBoundaryValues,
+                    field.boundaryField()[patchi].size(),
+                    field.boundaryField()[patchi].patch().start()
+                  - mesh.nInternalFaces()
+                );
+            }
+        }
+
+        field.write();
+    }
+    else
+    {
+        WarningIn
+        (
+            "void setFaceFieldType"
+            "(const fvMesh& mesh, const labelList& selectedFaces,"
+            "Istream& fieldValueStream)"
+        ) << "Field " << fieldName << " not found" << endl;
+    }
+
+    return true;
+}
+
+
+class setFaceField
+{
+
+public:
+
+    setFaceField()
+    {}
+
+    autoPtr<setFaceField> clone() const
+    {
+        return autoPtr<setFaceField>(new setFaceField());
+    }
+
+    class iNew
+    {
+        const fvMesh& mesh_;
+        const labelList& selectedFaces_;
+
+    public:
+
+        iNew(const fvMesh& mesh, const labelList& selectedFaces)
+        :
+            mesh_(mesh),
+            selectedFaces_(selectedFaces)
+        {}
+
+        autoPtr<setFaceField> operator()(Istream& fieldValues) const
+        {
+            word fieldType(fieldValues);
+
+            if
+            (
+               !(
+                    setFaceFieldType<scalar>
+                        (fieldType, mesh_, selectedFaces_, fieldValues)
+                 || setFaceFieldType<vector>
+                        (fieldType, mesh_, selectedFaces_, fieldValues)
+                 || setFaceFieldType<sphericalTensor>
+                        (fieldType, mesh_, selectedFaces_, fieldValues)
+                 || setFaceFieldType<symmTensor>
+                        (fieldType, mesh_, selectedFaces_, fieldValues)
+                 || setFaceFieldType<tensor>
+                        (fieldType, mesh_, selectedFaces_, fieldValues)
+                )
+            )
+            {
+                WarningIn("setFaceField::iNew::operator()(Istream& is)")
+                    << "field type " << fieldType << " not currently supported"
+                    << endl;
+            }
+
+            return autoPtr<setFaceField>(new setFaceField());
+        }
+    };
+};
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
@@ -194,10 +359,10 @@ int main(int argc, char *argv[])
     if (setFieldsDict.found("defaultFieldValues"))
     {
         Info<< "Setting field default values" << endl;
-        PtrList<setField> defaultFieldValues
+        PtrList<setCellField> defaultFieldValues
         (
             setFieldsDict.lookup("defaultFieldValues"),
-            setField::iNew(mesh, labelList(mesh.nCells()))
+            setCellField::iNew(mesh, labelList(mesh.nCells()))
         );
         Info<< endl;
     }
@@ -211,29 +376,54 @@ int main(int argc, char *argv[])
     {
         const entry& region = regions[regionI];
 
-        autoPtr<topoSetSource> cellSelector =
+        autoPtr<topoSetSource> source =
             topoSetSource::New(region.keyword(), mesh, region.dict());
 
-        cellSet selectedCellSet
-        (
-            mesh,
-            "cellSet",
-            mesh.nCells()/10+1  // Reasonable size estimate.
-        );
+        if (source().setType() == topoSetSource::CELLSETSOURCE)
+        {
+            cellSet selectedCellSet
+            (
+                mesh,
+                "cellSet",
+                mesh.nCells()/10+1  // Reasonable size estimate.
+            );
 
-        cellSelector->applyToSet
-        (
-            topoSetSource::NEW,
-            selectedCellSet
-        );
+            source->applyToSet
+            (
+                topoSetSource::NEW,
+                selectedCellSet
+            );
 
-        PtrList<setField> fieldValues
-        (
-            region.dict().lookup("fieldValues"),
-            setField::iNew(mesh, selectedCellSet.toc())
-        );
+            PtrList<setCellField> fieldValues
+            (
+                region.dict().lookup("fieldValues"),
+                setCellField::iNew(mesh, selectedCellSet.toc())
+            );
+        }
+        else if (source().setType() == topoSetSource::FACESETSOURCE)
+        {
+            faceSet selectedFaceSet
+            (
+                mesh,
+                "faceSet",
+                (mesh.nFaces()-mesh.nInternalFaces())/10+1
+            );
+
+            source->applyToSet
+            (
+                topoSetSource::NEW,
+                selectedFaceSet
+            );
+
+            PtrList<setFaceField> fieldValues
+            (
+                region.dict().lookup("fieldValues"),
+                setFaceField::iNew(mesh, selectedFaceSet.toc())
+            );
+        }
     }
 
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/applications/utilities/preProcessing/setFields/setFieldsDict b/applications/utilities/preProcessing/setFields/setFieldsDict
index 8d33be4c8f..c58e622ff7 100644
--- a/applications/utilities/preProcessing/setFields/setFieldsDict
+++ b/applications/utilities/preProcessing/setFields/setFieldsDict
@@ -23,6 +23,8 @@ defaultFieldValues
 
 regions
 (
+    // Set cell values
+    // (does zerogradient on boundaries)
     boxToCell
     {
         box (0 0 -1) (0.1461 0.292 1);
@@ -32,6 +34,17 @@ regions
             volScalarFieldValue gamma 1
         );
     }
+
+    // Set patch values (using ==)
+    boxToFace
+    {
+        box (0 0 -1) (0.1461 0.292 1);
+
+        fieldValues
+        (
+            volScalarFieldValue gamma 1
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
index 1bf676cd54..1f67b52336 100644
--- a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
+++ b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
@@ -48,11 +48,13 @@ int main(int argc, char *argv[])
 
     OFstream reactionsFile(args[3]);
     reactionsFile
-        << "species" << cr.species() << token::END_STATEMENT << nl << nl
-        << "reactions" << cr.reactions() << token::END_STATEMENT << endl;
+        << "species" << cr.species() << token::END_STATEMENT << nl << nl;
+
+    cr.reactions().write(reactionsFile);
+
 
     OFstream thermoFile(args[4]);
-    thermoFile<< cr.speciesThermo() << endl;
+    cr.speciesThermo().write(thermoFile);
 
     Info<< "End\n" << endl;
 
diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index 3256ff4ba6..1ada431b20 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -56,7 +56,7 @@ cleanTimeDirectories()
         zeros=`printf %0${nZeros}d 0`
         nZeros=$(($nZeros + 1))
     done
-    rm -rf ./{[1-9]*,-[1-9]*,log,log.*,log-*,logSummary.*,.fxLock,*.xml,ParaView*,paraFoam*,*.OpenFOAM} > /dev/null 2>&1
+    rm -rf ./[1-9]* ./-[1-9]* ./log ./log.* ./log-* ./logSummary.* ./.fxLock ./*.xml ./ParaView* ./paraFoam* ./*.OpenFOAM > /dev/null 2>&1
 }
 
 cleanCase()
@@ -65,16 +65,20 @@ cleanCase()
     rm -rf processor* > /dev/null 2>&1
     rm -rf probes* > /dev/null 2>&1
     rm -rf forces* > /dev/null 2>&1
-
-    rm -rf system/machines \
-           constant/polyMesh/{allOwner*,cell*,face*,meshModifiers*} \
-           constant/polyMesh/{owner*,neighbour*,point*,edge*} \
-           constant/polyMesh/{cellLevel*,pointLevel*,refinementHistory*,surfaceIndex*} \
-           constant/{cellToRegion,cellLevel*,pointLevel*} \
-           constant/polyMesh/sets/ \
-           VTK \
-           sets/streamLines \
-           > /dev/null 2>&1
+    rm -rf system/machines > /dev/null 2>&1
+    (cd constant/polyMesh && \
+        rm -rf \
+        allOwner* cell* face* meshModifiers* \
+        owner* neighbour* point* edge* \
+        cellLevel* pointLevel* refinementHistory* surfaceIndex* sets \
+        > /dev/null 2>&1 \
+    )
+    (cd constant && \
+        rm -rf \
+        cellToRegion cellLevel* pointLevel* \
+        > /dev/null 2>&1 \
+    )
+    rm -rf VTK > /dev/null 2>&1
 
     if [ -e constant/polyMesh/blockMeshDict.m4 ]
     then
@@ -96,12 +100,12 @@ removeCase()
 
 cleanSamples()
 {
-    rm -rf {sets,samples,sampleSurfaces} > /dev/null 2>&1
+    rm -rf ./sets ./samples ./sampleSurfaces > /dev/null 2>&1
 }
 
 cleanUcomponents()
 {
-    rm -rf 0/{Ux,Uy,Uz} > /dev/null 2>&1
+    rm -rf 0/Ux 0/Uy 0/Uz > /dev/null 2>&1
 }
 
 cleanApplication()
diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths
old mode 100755
new mode 100644
index 823c816d51..eb85ed9d97
--- a/bin/tools/foamConfigurePaths
+++ b/bin/tools/foamConfigurePaths
@@ -34,10 +34,10 @@ usage() {
     cat<<USAGE
 
 usage: ${0##*/}
-  --foamInstall dir       specify installation directory (e.g. /opt)
-  --projectName name      specify project name (e.g. openfoam170)
-  --archOption  arch      specify architecture option (only 32 or 64 applicable)
-  --paraviewInstall dir   specify ParaView_DIR (e.g. /opt/paraviewopenfoam380)
+  --foamInstall dir         specify installation directory (e.g. /opt)
+  --projectName name        specify project name (e.g. openfoam170)
+  --archOption  arch        specify architecture option (only 32 or 64 applicable)
+  --paraviewInstall dir     specify ParaView_DIR (e.g. /opt/paraviewopenfoam380)
 
 * hardcode paths to installation
 
@@ -46,6 +46,17 @@ USAGE
 }
 
 
+# Function to do replacement on file. Checks if any replacement has been done.
+# inlineSed <file> <sedCommand> <description>
+_inlineSed()
+{
+    backup=`tempfile`
+    cp $1 $backup
+    sed -i -e "$2" $1
+    cmp $1 $backup || usage "Failed : $3"
+}
+
+
 [ -f etc/bashrc -a -f etc/settings.sh ] || usage "Please run from top-level directory of installation"
 
 unset foamInstall projectName archOption paraviewInstall
@@ -59,30 +70,40 @@ do
         ;;
     --foamInstall)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        foamInstall="$2"
-        echo "Replacing foamInstall setting by $foamInstall"
-        sed -i -e '/^[^#]/s@foamInstall=.*@foamInstall='"$foamInstall@" etc/bashrc
+    foamInstall="$2"
+        echo "** foamInstall:$foamInstall"
+
+        _inlineSed \
+            etc/bashrc \
+            '/^[^#]/s@foamInstall=.*@foamInstall='"$foamInstall@" \
+            "Replacing foamInstall setting by $foamInstall"
         shift 2
         ;;
    --projectName)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        projectName="$2"
-        echo "Replacing WM_PROJECT_DIR setting by $projectName"
-        sed -i -e '/^[^#]/s@WM_PROJECT_DIR=.*@WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName@" etc/bashrc
+    projectName="$2"
+        _inlineSed \
+            etc/bashrc \
+            '/^[^#]/s@WM_PROJECT_DIR=.*@WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName@" \
+            "Replacing WM_PROJECT_DIR setting by $projectName"
         shift 2
         ;;
     --archOption)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        archOption="$2"
-        echo "Replacing WM_ARCH_OPTION setting by $archOption"
-        sed -i -e '/^[^#]/s@: ${WM_ARCH_OPTION:=64}@WM_ARCH_OPTION='"$archOption@" etc/bashrc
+    archOption="$2"
+        _inlineSed \
+            etc/bashrc \
+            '/^[^#]/s@: ${WM_ARCH_OPTION:=64}@WM_ARCH_OPTION='"$archOption@" \
+             "Replacing WM_ARCH_OPTION setting by $archOption"
         shift 2
         ;;
     --paraviewInstall)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        paraviewInstall="$2"
-        echo "Replacing ParaView_DIR setting by $paraviewInstall"
-        sed -i -e '/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" etc/apps/paraview3/bashrc
+    paraviewInstall="$2"
+        _inlineSed \
+            etc/apps/paraview3/bashrc \
+            '/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" \
+             "Replacing ParaView_DIR setting by $paraviewInstall"
         shift 2
         ;;
     *)
@@ -97,11 +118,14 @@ done
 #sed -i -e 's@WM_PROJECT=.*@WM_PROJECT='"$projectName@" etc/bashrc
 
 # Replace the WM_MPLIB always
-echo "Replacing WM_MPLIB setting by SYSTEMOPENMPI"
-sed -i -e '/^[^#]/s@: ${WM_MPLIB:=.*}@WM_MPLIB=SYSTEMOPENMPI@' etc/bashrc
-
+_inlineSed \
+    etc/bashrc \
+    '/^[^#]/s@: ${WM_MPLIB:=.*}@WM_MPLIB=SYSTEMOPENMPI@' \
+    "Replacing WM_MPLIB setting by SYSTEMOPENMPI"
 # Replace the compilerInstall always
-echo "Replacing compilerInstall setting by system"
-sed -i -e '/^[^#]/s@: ${compilerInstall:=.*}@compilerInstall=system@' etc/settings.sh
+_inlineSed \
+    etc/settings.sh \
+    '/^[^#]/s@: ${compilerInstall:=.*}@compilerInstall=system@' \
+    "Replacing compilerInstall setting by system"
 
 #------------------------------------------------------------------------------
diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index 1445ad0bc2..51a8ae2b50 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -574,12 +574,14 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-# INPUT                  = $(WM_PROJECT_DIR)/src \
+#INPUT                  = $(WM_PROJECT_DIR)/src \
 #                         $(WM_PROJECT_DIR)/applications/utilities \
 #                         $(WM_PROJECT_DIR)/applications/solvers
 
 # limit input for testing purposes
-INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global
+INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global \
+                         $(WM_PROJECT_DIR)/src/OpenFOAM/containers \
+                         $(WM_PROJECT_DIR)/src/OpenFOAM/primitives
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/etc/settings.csh b/etc/settings.csh
index 8b51bb7b41..d1d9a413fc 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -108,6 +108,12 @@ case OpenFOAM:
         set gmp_version=gmp-4.2.4
         set mpfr_version=mpfr-2.4.1
         breaksw
+    case Clang:
+        # using clang - not gcc
+        setenv WM_CC 'clang'
+        setenv WM_CXX 'clang++'
+        set clang_version=llvm-2.8
+        breaksw
     default:
         echo
         echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
@@ -159,6 +165,25 @@ case OpenFOAM:
     endif
     unset gcc_version gccDir
     unset gmp_version gmpDir  mpfr_version mpfrDir  mpc_version mpcDir
+
+    if ( $?clang_version ) then
+        set clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version
+
+        # Check that the compiler directory can be found
+        if ( ! -d "$clangDir" ) then
+            echo
+            echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
+            echo "    Cannot find $clangDir installation."
+            echo "    Please install this compiler version or if you wish to use the system compiler,"
+            echo "    change the 'compilerInstall' setting to 'system' in this file"
+            echo
+        endif
+
+        _foamAddMan     $clangDir/man
+        _foamAddPath    $clangDir/bin
+    endif
+    unset clang_version clangDir
+
     breaksw
 endsw
 
diff --git a/etc/settings.sh b/etc/settings.sh
index aae19a764b..4a1ce214c3 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -131,6 +131,12 @@ OpenFOAM)
         gmp_version=gmp-4.2.4
         mpfr_version=mpfr-2.4.1
         ;;
+    Clang)
+        # using clang - not gcc
+        export WM_CC='clang'
+        export WM_CXX='clang++'
+        clang_version=llvm-2.8
+        ;;
     *)
         echo
         echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
@@ -183,6 +189,25 @@ OpenFOAM)
     fi
     unset gcc_version gccDir
     unset gmp_version gmpDir  mpfr_version mpfrDir  mpc_version mpcDir
+
+    if [ -n "$clang_version" ]
+    then
+        clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version
+
+        # Check that the compiler directory can be found
+        [ -d "$clangDir" ] || {
+            echo
+            echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
+            echo "    Cannot find $clangDir installation."
+            echo "    Please install this compiler version or if you wish to use the system compiler,"
+            echo "    change the 'compilerInstall' setting to 'system' in this file"
+            echo
+        }
+
+        _foamAddMan     $clangDir/share/man
+        _foamAddPath    $clangDir/bin
+    fi
+    unset clang_version clangDir
     ;;
 esac
 
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index 48807d2e68..4779142778 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -39,7 +39,7 @@ Class
 #else
 #   include <sys/inotify.h>
 #   include <sys/ioctl.h>
-
+#   include <errno.h>
 #   define EVENT_SIZE  ( sizeof (struct inotify_event) )
 #   define EVENT_LEN   (EVENT_SIZE + 16)
 #   define EVENT_BUF_LEN     ( 1024 * EVENT_LEN )
@@ -49,19 +49,19 @@ Class
 
 defineTypeNameAndDebug(Foam::fileMonitor, 0);
 
-template<>
-const char* Foam::NamedEnum<Foam::fileMonitor::fileState, 3>::names[] =
-{
-    "unmodified",
-    "modified",
-    "deleted"
-};
 const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
     Foam::fileMonitor::fileStateNames_;
 
-
 namespace Foam
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::fileMonitor::fileState, 3>::names[] =
+    {
+        "unmodified",
+        "modified",
+        "deleted"
+    };
+
     //- Reduction operator for PackedList of fileState
     class reduceFileStates
     {
@@ -144,7 +144,7 @@ namespace Foam
 
 #else
         //- File descriptor for the inotify instance
-        int fd;
+        int inotifyFd_;
 
         //- Current watchIDs and corresponding directory id
         DynamicList<label> dirWatches_;
@@ -153,23 +153,45 @@ namespace Foam
         //- initialise inotify
         inline fileMonitorWatcher(const label sz = 20)
         :
-            fd(inotify_init()),
+            inotifyFd_(inotify_init()),
             dirWatches_(sz),
             dirFiles_(sz)
-        {}
+        {
+            if (inotifyFd_ < 0)
+            {
+                static bool hasWarned = false;
+                if (!hasWarned)
+                {
+                    hasWarned = true;
+                    WarningIn("fileMonitorWatcher(const label)")
+                        << "Failed allocating an inotify descriptor : "
+                        << string(strerror(errno)) << endl
+                        << "    Please increase the number of allowable "
+                        << "inotify instances" << endl
+                        << "    (/proc/sys/fs/inotify/max_user_instances"
+                        << " on Linux)" << endl
+                        << "    or switch off runTimeModifiable." << endl
+                        << "    Continuing without additional file monitoring."
+                        << endl;
+                }
+            }
+        }
 
         //- remove all watches
         inline ~fileMonitorWatcher()
         {
-            forAll(dirWatches_, i)
+            if (inotifyFd_ >= 0)
             {
-                if (dirWatches_[i] >= 0)
+                forAll(dirWatches_, i)
                 {
-                    if (inotify_rm_watch(fd, int(dirWatches_[i])))
+                    if (dirWatches_[i] >= 0)
                     {
-                        WarningIn("fileMonitor::~fileMonitor()")
-                            << "Failed deleting directory watch "
-                            << dirWatches_[i] << endl;
+                        if (inotify_rm_watch(inotifyFd_, int(dirWatches_[i])))
+                        {
+                            WarningIn("fileMonitor::~fileMonitor()")
+                                << "Failed deleting directory watch "
+                                << dirWatches_[i] << endl;
+                        }
                     }
                 }
             }
@@ -177,10 +199,15 @@ namespace Foam
 
         inline bool addWatch(const label watchFd, const fileName& fName)
         {
+            if (inotifyFd_ < 0)
+            {
+                return false;
+            }
+
             // Add/retrieve watch on directory containing file
             label dirWatchID = inotify_add_watch
             (
-                fd,
+                inotifyFd_,
                 fName.path().c_str(),
                 IN_CLOSE_WRITE
             );
@@ -189,7 +216,8 @@ namespace Foam
             {
                 FatalErrorIn("addWatch(const label, const fileName&)")
                     << "Failed adding watch " << watchFd
-                    << " to directory " << fName
+                    << " to directory " << fName << " due to "
+                    << string(strerror(errno))
                     << exit(FatalError);
             }
 
@@ -209,6 +237,11 @@ namespace Foam
 
         inline bool removeWatch(const label watchFd)
         {
+            if (inotifyFd_ < 0)
+            {
+                return false;
+            }
+
             dirWatches_[watchFd] = -1;
             return true;
         }
@@ -263,11 +296,11 @@ void Foam::fileMonitor::checkFiles() const
         fd_set fdSet;
         // Add notify descriptor to select fd_set
         FD_ZERO(&fdSet);
-        FD_SET(watcher_->fd, &fdSet);
+        FD_SET(watcher_->inotifyFd_, &fdSet);
 
         int ready = select
         (
-            watcher_->fd+1,     // num filedescriptors in fdSet
+            watcher_->inotifyFd_+1,     // num filedescriptors in fdSet
             &fdSet,             // fdSet with only inotifyFd
             NULL,               // No writefds
             NULL,               // No errorfds
@@ -280,15 +313,15 @@ void Foam::fileMonitor::checkFiles() const
                 << "Problem in issuing select."
                 << abort(FatalError);
         }
-        else if (FD_ISSET(watcher_->fd, &fdSet))
+        else if (FD_ISSET(watcher_->inotifyFd_, &fdSet))
         {
             // Read events
-            ssize_t nBytes = read(watcher_->fd, buffer, EVENT_BUF_LEN);
+            ssize_t nBytes = read(watcher_->inotifyFd_, buffer, EVENT_BUF_LEN);
 
             if (nBytes < 0)
             {
                 FatalErrorIn("fileMonitor::updateStates(const fileName&)")
-                    << "read of " << watcher_->fd
+                    << "read of " << watcher_->inotifyFd_
                     << " failed with " << label(nBytes)
                     << abort(FatalError);
             }
@@ -364,6 +397,7 @@ Foam::label Foam::fileMonitor::addWatch(const fileName& fName)
     label watchFd;
 
     label sz = freeWatchFds_.size();
+
     if (sz)
     {
         watchFd = freeWatchFds_[sz-1];
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 97513b339d..09fa5faa94 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -346,6 +346,7 @@ $(basicPolyPatches)/generic/genericPolyPatch.C
 constraintPolyPatches = $(polyPatches)/constraint
 $(constraintPolyPatches)/cyclic/cyclicPolyPatch.C
 $(constraintPolyPatches)/cyclicSlip/cyclicSlipPolyPatch.C
+$(constraintPolyPatches)/oldCyclic/oldCyclicPolyPatch.C
 $(constraintPolyPatches)/empty/emptyPolyPatch.C
 $(constraintPolyPatches)/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C
 $(constraintPolyPatches)/processorCyclic/processorCyclicPolyPatch.C
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index 29896fc836..0e826742d9 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -72,6 +72,11 @@ class HashPtrTable
         template<class INew>
         void read(Istream&, const INew& inewt);
 
+        //- Read from dictionary using given dictionary constructor class
+        template<class INew>
+        void read(const dictionary& dict, const INew& inewt);
+
+
 
 public:
 
@@ -91,6 +96,10 @@ public:
         //- Construct from Istream using default Istream constructor class
         HashPtrTable(Istream&);
 
+        //- Construct from dictionary using default dictionary constructor
+        //  class
+        HashPtrTable(const dictionary& dict);
+
         //- Construct as copy
         HashPtrTable(const HashPtrTable<T, Key, Hash>&);
 
@@ -112,6 +121,9 @@ public:
             //- Clear all entries from table
             void clear();
 
+            //- Write
+            void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
index 1930e117b3..82c02609dd 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
@@ -27,6 +27,7 @@ License
 #include "Istream.H"
 #include "Ostream.H"
 #include "INew.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
@@ -137,6 +138,39 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
 }
 
 
+template<class T, class Key, class Hash>
+template<class INew>
+void Foam::HashPtrTable<T, Key, Hash>::read
+(
+    const dictionary& dict,
+    const INew& inewt
+)
+{
+    forAllConstIter(dictionary, dict, iter)
+    {
+        insert(iter().keyword(), inewt(dict.subDict(iter().keyword())).ptr());
+    }
+}
+
+
+template<class T, class Key, class Hash>
+void Foam::HashPtrTable<T, Key, Hash>::write(Ostream& os) const
+{
+
+    for
+    (
+        typename HashPtrTable<T, Key, Hash>::const_iterator
+        iter = this->begin();
+        iter != this->end();
+        ++iter
+    )
+    {
+        const T* ptr = iter();
+        ptr->write(os);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -154,6 +188,13 @@ Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(Istream& is)
 }
 
 
+template<class T, class Key, class Hash>
+Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const dictionary& dict)
+{
+    read(dict, INew<T>());
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
index 7e47674b8b..fb790a3e05 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
@@ -51,6 +51,12 @@ SeeAlso
 namespace Foam
 {
 
+// Forward declaration
+class PackedBoolList;
+
+//- @typedef A List of PackedBoolList
+typedef List<PackedBoolList> PackedBoolListList;
+
 /*---------------------------------------------------------------------------*\
                        Class PackedBoolList Declaration
 \*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 8f7e009287..d0cb05fc17 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -59,6 +59,7 @@ template<class T> class SubList;
 template<class T> class UList;
 template<class T> Ostream& operator<<(Ostream&, const UList<T>&);
 
+typedef UList<label> labelUList;
 
 /*---------------------------------------------------------------------------*\
                            Class UList Declaration
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/INew.H b/src/OpenFOAM/db/IOstreams/IOstreams/INew.H
index cd69fe3919..23c18150fb 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/INew.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/INew.H
@@ -25,7 +25,7 @@ Class
     Foam::INew
 
 Description
-    A helper class when constructing from an Istream
+    A helper class when constructing from an Istream or dictionary
 
 \*---------------------------------------------------------------------------*/
 
@@ -52,18 +52,33 @@ class INew
 
 public:
 
+    //- Construct null
     INew()
     {}
 
+    //- Construct from Istream
     autoPtr<T> operator()(Istream& is) const
     {
         return T::New(is);
     }
 
+    //- Construct from word and Istream
     autoPtr<T> operator()(const word&, Istream& is) const
     {
         return T::New(is);
     }
+
+    //- Construct from dictionary
+    autoPtr<T> operator()(const dictionary& dict) const
+    {
+        return T::New(dict);
+    }
+
+    //- Construct from word and dictionary
+    autoPtr<T> operator()(const word&, const dictionary& dict) const
+    {
+        return T::New(dict);
+    }
 };
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index b5d22692f0..51e2fadfe7 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -32,13 +32,17 @@ License
 
 defineTypeNameAndDebug(Foam::UPstream, 0);
 
-template<>
-const char* Foam::NamedEnum<Foam::UPstream::commsTypes, 3>::names[] =
+namespace Foam
 {
-    "blocking",
-    "scheduled",
-    "nonBlocking"
-};
+    template<>
+    const char* Foam::NamedEnum<Foam::UPstream::commsTypes, 3>::names[] =
+    {
+        "blocking",
+        "scheduled",
+        "nonBlocking"
+    };
+}
+
 
 const Foam::NamedEnum<Foam::UPstream::commsTypes, 3>
     Foam::UPstream::commsTypeNames;
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index aadcdc7c54..5a5fbb8fa7 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -32,28 +32,31 @@ License
 
 defineTypeNameAndDebug(Foam::Time, 0);
 
-template<>
-const char* Foam::NamedEnum<Foam::Time::stopAtControls, 4>::names[] =
+namespace Foam
 {
-    "endTime",
-    "noWriteNow",
-    "writeNow",
-    "nextWrite"
-};
+    template<>
+    const char* Foam::NamedEnum<Foam::Time::stopAtControls, 4>::names[] =
+    {
+        "endTime",
+        "noWriteNow",
+        "writeNow",
+        "nextWrite"
+    };
+
+    template<>
+    const char* Foam::NamedEnum<Foam::Time::writeControls, 5>::names[] =
+    {
+        "timeStep",
+        "runTime",
+        "adjustableRunTime",
+        "clockTime",
+        "cpuTime"
+    };
+}
 
 const Foam::NamedEnum<Foam::Time::stopAtControls, 4>
     Foam::Time::stopAtControlNames_;
 
-template<>
-const char* Foam::NamedEnum<Foam::Time::writeControls, 5>::names[] =
-{
-    "timeStep",
-    "runTime",
-    "adjustableRunTime",
-    "clockTime",
-    "cpuTime"
-};
-
 const Foam::NamedEnum<Foam::Time::writeControls, 5>
     Foam::Time::writeControlNames_;
 
@@ -242,13 +245,14 @@ Foam::Time::Time
     readLibs_(controlDict_, "libs"),
     functionObjects_(*this)
 {
+    setControls();
+
     // Time objects not registered so do like objectRegistry::checkIn ourselves.
     if (runTimeModifiable_)
     {
+        monitorPtr_.reset(new fileMonitor());
         controlDict_.watchIndex() = addWatch(controlDict_.filePath());
     }
-
-    setControls();
 }
 
 
@@ -304,14 +308,20 @@ Foam::Time::Time
     readLibs_(controlDict_, "libs"),
     functionObjects_(*this)
 {
+    setControls();
 
     // Time objects not registered so do like objectRegistry::checkIn ourselves.
     if (runTimeModifiable_)
     {
-        controlDict_.watchIndex() = addWatch(controlDict_.filePath());
-    }
+        monitorPtr_.reset(new fileMonitor());
 
-    setControls();
+        // File might not exist yet.
+        fileName f(controlDict_.filePath());
+        if (f != fileName::null)
+        {
+            controlDict_.watchIndex() = addWatch(f);
+        }
+    }
 }
 
 
@@ -385,18 +395,18 @@ Foam::Time::~Time()
 
 Foam::label Foam::Time::addWatch(const fileName& fName) const
 {
-    return monitor_.addWatch(fName);
+    return monitorPtr_().addWatch(fName);
 }
 
 
 bool Foam::Time::removeWatch(const label watchIndex) const
 {
-    return monitor_.removeWatch(watchIndex);
+    return monitorPtr_().removeWatch(watchIndex);
 }
 
 const Foam::fileName& Foam::Time::getFile(const label watchIndex) const
 {
-    return monitor_.getFile(watchIndex);
+    return monitorPtr_().getFile(watchIndex);
 }
 
 
@@ -405,13 +415,13 @@ Foam::fileMonitor::fileState Foam::Time::getState
     const label watchFd
 ) const
 {
-    return monitor_.getState(watchFd);
+    return monitorPtr_().getState(watchFd);
 }
 
 
 void Foam::Time::setUnmodified(const label watchFd) const
 {
-    monitor_.setUnmodified(watchFd);
+    monitorPtr_().setUnmodified(watchFd);
 }
 
 
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index c644c757be..f9e38b58ee 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -73,7 +73,7 @@ class Time
     // Private data
 
         //- file-change monitor for all registered files
-        mutable fileMonitor monitor_;
+        mutable autoPtr<fileMonitor> monitorPtr_;
 
         //- The controlDict
         IOdictionary controlDict_;
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index e7c38a6aa6..86db2e1c2f 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -211,10 +211,7 @@ void Foam::Time::readModifiedObjects()
         // valid filePath).
         // Note: requires same ordering in objectRegistries on different
         // processors!
-        monitor_.updateStates(Pstream::parRun());
-
-//Pout<< "Time : runTimeModifiable_ and watchIndex:"
-//    << controlDict_.watchIndex() << endl;
+        monitorPtr_().updateStates(Pstream::parRun());
 
         // Time handling is special since controlDict_ is the one dictionary
         // that is not registered to any database.
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index bb5f186aad..26fe7f6dd7 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -111,6 +111,23 @@ public:
         {
             return name_;
         }
+
+        //- Return the local dictionary name (final part of scoped name)
+        const word dictName() const
+        {
+            const word scopedName = name_.name();
+
+            string::size_type i = scopedName.rfind(':');
+
+            if (i == scopedName.npos)
+            {
+                return scopedName;
+            }
+            else
+            {
+                return scopedName.substr(i + 1, scopedName.npos);
+            }
+        }
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
index 54aeb6c899..693c9a03f3 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
+++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
@@ -106,13 +106,19 @@ public:
 
     // Member functions
 
-        //- Return the dictionary name
+        //- Return the local dictionary name (final part of scoped name)
+        const word dictName() const
+        {
+            return dictionary::dictName();
+        }
+
+        //- Return the dictionary name (scoped, e.g. dictA::dictB::dictC)
         const fileName& name() const
         {
             return dictionary::name();
         }
 
-        //- Return the dictionary name
+        //- Return the dictionary name (scoped, e.g. dictA::dictB::dictC)
         fileName& name()
         {
             return dictionary::name();
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
index 82e74c55c7..008085253d 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
@@ -27,16 +27,19 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-template<>
-const char* Foam::NamedEnum
-<
-    Foam::outputFilterOutputControl::outputControls,
-    2
->::names[] =
+namespace Foam
 {
-    "timeStep",
-    "outputTime"
-};
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::outputFilterOutputControl::outputControls,
+        2
+    >::names[] =
+    {
+        "timeStep",
+        "outputTime"
+    };
+}
 
 const Foam::NamedEnum<Foam::outputFilterOutputControl::outputControls, 2>
     Foam::outputFilterOutputControl::outputControlNames_;
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduSchedule/lduSchedule.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduSchedule/lduSchedule.H
index 7c975627cc..3793a54528 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduSchedule/lduSchedule.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduSchedule/lduSchedule.H
@@ -42,7 +42,7 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-class lduScheduleEntry;
+struct lduScheduleEntry;
 Ostream& operator<<(Ostream& os, const lduScheduleEntry& lb);
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 330b912fb9..370a90c89e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -44,16 +44,20 @@ namespace Foam
 
     addToRunTimeSelectionTable(polyPatch, cyclicPolyPatch, word);
     addToRunTimeSelectionTable(polyPatch, cyclicPolyPatch, dictionary);
-}
 
-template<>
-const char* Foam::NamedEnum<Foam::cyclicPolyPatch::transformType, 4>::names[] =
-{
-    "unknown",
-    "rotational",
-    "translational",
-    "noOrdering"
-};
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::cyclicPolyPatch::transformType,
+        4
+    >::names[] =
+    {
+        "unknown",
+        "rotational",
+        "translational",
+        "noOrdering"
+    };
+}
 
 const Foam::NamedEnum<Foam::cyclicPolyPatch::transformType, 4>
     Foam::cyclicPolyPatch::transformTypeNames;
@@ -91,44 +95,58 @@ void Foam::cyclicPolyPatch::calcTransforms()
         // Half0
 
         const cyclicPolyPatch& half0 = *this;
-
-        const pointField& half0Ctrs = half0.faceCentres();
-
-        if (debug)
-        {
-            fileName casePath(boundaryMesh().mesh().time().path());
-
-            fileName nm0(casePath/name()+"_faces.obj");
-            Pout<< "cyclicPolyPatch::calcTransforms : Writing " << name()
-                << " faces to OBJ file " << nm0 << endl;
-            writeOBJ(nm0, half0, half0.points());
-        }
-
         vectorField half0Areas(half0.size());
-
         forAll(half0, facei)
         {
             half0Areas[facei] = half0[facei].normal(half0.points());
         }
 
-
-
         // Half1
-
         const cyclicPolyPatch& half1 = neighbPatch();
-
-        const pointField& half1Ctrs = half1.faceCentres();
-
-        // Dump halves
-        if (debug)
+        vectorField half1Areas(half1.size());
+        forAll(half1, facei)
         {
-            fileName casePath(boundaryMesh().mesh().time().path());
+            half1Areas[facei] = half1[facei].normal(half1.points());
+        }
 
+        calcTransforms
+        (
+            half0,
+            half0.faceCentres(),
+            half0Areas,
+            half1.faceCentres(),
+            half1Areas
+        );
+    }
+}
+
+
+void Foam::cyclicPolyPatch::calcTransforms
+(
+    const primitivePatch& half0,
+    const UList<point>& half0Ctrs,
+    const UList<point>& half0Areas,
+    const UList<point>& half1Ctrs,
+    const UList<point>& half1Areas
+)
+{
+    if (debug && owner())
+    {
+        fileName casePath(boundaryMesh().mesh().time().path());
+        {
+            fileName nm0(casePath/name()+"_faces.obj");
+            Pout<< "cyclicPolyPatch::calcTransforms : Writing " << name()
+                << " faces to OBJ file " << nm0 << endl;
+            writeOBJ(nm0, half0, half0.points());
+        }
+        const cyclicPolyPatch& half1 = neighbPatch();
+        {
             fileName nm1(casePath/half1.name()+"_faces.obj");
             Pout<< "cyclicPolyPatch::calcTransforms : Writing " << half1.name()
                 << " faces to OBJ file " << nm1 << endl;
             writeOBJ(nm1, half1, half1.points());
-
+        }
+        {
             OFstream str(casePath/name()+"_to_" + half1.name() + ".obj");
             label vertI = 0;
             Pout<< "cyclicPolyPatch::calcTransforms :"
@@ -145,35 +163,10 @@ void Foam::cyclicPolyPatch::calcTransforms()
                 str << "l " << vertI-1 << ' ' << vertI << nl;
             }
         }
-
-        vectorField half1Areas(half1.size());
-
-        forAll(half1, facei)
-        {
-            half1Areas[facei] = half1[facei].normal(half1.points());
-        }
-
-        calcTransforms
-        (
-            half0,
-            half0Ctrs,
-            half0Areas,
-            half1Ctrs,
-            half1Areas
-        );
     }
-}
 
 
-void Foam::cyclicPolyPatch::calcTransforms
-(
-    const primitivePatch& half0,
-    const UList<point>& half0Ctrs,
-    const UList<point>& half0Areas,
-    const UList<point>& half1Ctrs,
-    const UList<point>& half1Areas
-)
-{
+
     if (half0Ctrs.size() != half1Ctrs.size())
     {
         FatalErrorIn
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
new file mode 100644
index 0000000000..218debfa5b
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
@@ -0,0 +1,1293 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+     \\/     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 "oldCyclicPolyPatch.H"
+#include "addToRunTimeSelectionTable.H"
+#include "polyBoundaryMesh.H"
+#include "polyMesh.H"
+#include "demandDrivenData.H"
+#include "OFstream.H"
+#include "patchZones.H"
+#include "matchPoints.H"
+#include "Time.H"
+#include "transformList.H"
+#include "cyclicPolyPatch.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(oldCyclicPolyPatch, 0);
+
+    addToRunTimeSelectionTable(polyPatch, oldCyclicPolyPatch, word);
+    addToRunTimeSelectionTable(polyPatch, oldCyclicPolyPatch, dictionary);
+
+
+template<>
+const char* NamedEnum<oldCyclicPolyPatch::transformType, 3>::names[] =
+{
+    "unknown",
+    "rotational",
+    "translational"
+};
+
+const NamedEnum<oldCyclicPolyPatch::transformType, 3>
+    oldCyclicPolyPatch::transformTypeNames;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::pointField Foam::oldCyclicPolyPatch::calcFaceCentres
+(
+    const UList<face>& faces,
+    const pointField& points
+)
+{
+    pointField ctrs(faces.size());
+
+    forAll(faces, faceI)
+    {
+        ctrs[faceI] = faces[faceI].centre(points);
+    }
+
+    return ctrs;
+}
+
+
+Foam::pointField Foam::oldCyclicPolyPatch::getAnchorPoints
+(
+    const UList<face>& faces,
+    const pointField& points
+)
+{
+    pointField anchors(faces.size());
+
+    forAll(faces, faceI)
+    {
+        anchors[faceI] = points[faces[faceI][0]];
+    }
+
+    return anchors;
+}
+
+
+Foam::label Foam::oldCyclicPolyPatch::findMaxArea
+(
+    const pointField& points,
+    const faceList& faces
+)
+{
+    label maxI = -1;
+    scalar maxAreaSqr = -GREAT;
+
+    forAll(faces, faceI)
+    {
+        scalar areaSqr = magSqr(faces[faceI].normal(points));
+
+        if (areaSqr > maxAreaSqr)
+        {
+            maxAreaSqr = areaSqr;
+            maxI = faceI;
+        }
+    }
+    return maxI;
+}
+
+
+// Get geometric zones of patch by looking at normals.
+// Method 1: any edge with sharpish angle is edge between two halves.
+//           (this will handle e.g. wedge geometries).
+//           Also two fully disconnected regions will be handled this way.
+// Method 2: sort faces into two halves based on face normal.
+bool Foam::oldCyclicPolyPatch::getGeometricHalves
+(
+    const primitivePatch& pp,
+    labelList& half0ToPatch,
+    labelList& half1ToPatch
+) const
+{
+    // Calculate normals
+    const vectorField& faceNormals = pp.faceNormals();
+
+    // Find edges with sharp angles.
+    boolList regionEdge(pp.nEdges(), false);
+
+    const labelListList& edgeFaces = pp.edgeFaces();
+
+    label nRegionEdges = 0;
+
+    forAll(edgeFaces, edgeI)
+    {
+        const labelList& eFaces = edgeFaces[edgeI];
+
+        // Check manifold edges for sharp angle.
+        // (Non-manifold already handled by patchZones)
+        if (eFaces.size() == 2)
+        {
+            if ((faceNormals[eFaces[0]] & faceNormals[eFaces[1]])< featureCos_)
+            {
+                regionEdge[edgeI] = true;
+
+                nRegionEdges++;
+            }
+        }
+    }
+
+
+    // For every face determine zone it is connected to (without crossing
+    // any regionEdge)
+    patchZones ppZones(pp, regionEdge);
+
+    if (debug)
+    {
+        Pout<< "oldCyclicPolyPatch::getGeometricHalves : "
+            << "Found " << nRegionEdges << " edges on patch " << name()
+            << " where the cos of the angle between two connected faces"
+            << " was less than " << featureCos_ << nl
+            << "Patch divided by these and by single sides edges into "
+            << ppZones.nZones() << " parts." << endl;
+
+
+        // Dumping zones to obj files.
+
+        labelList nZoneFaces(ppZones.nZones());
+
+        for (label zoneI = 0; zoneI < ppZones.nZones(); zoneI++)
+        {
+            OFstream stream
+            (
+                boundaryMesh().mesh().time().path()
+               /name()+"_zone_"+Foam::name(zoneI)+".obj"
+            );
+            Pout<< "oldCyclicPolyPatch::getGeometricHalves : Writing zone "
+                << zoneI << " face centres to OBJ file " << stream.name()
+                << endl;
+
+            labelList zoneFaces(findIndices(ppZones, zoneI));
+
+            forAll(zoneFaces, i)
+            {
+                writeOBJ(stream, pp[zoneFaces[i]].centre(pp.points()));
+            }
+
+            nZoneFaces[zoneI] = zoneFaces.size();
+        }
+    }
+
+
+    if (ppZones.nZones() == 2)
+    {
+        half0ToPatch = findIndices(ppZones, 0);
+        half1ToPatch = findIndices(ppZones, 1);
+    }
+    else
+    {
+        if (debug)
+        {
+            Pout<< "oldCyclicPolyPatch::getGeometricHalves :"
+                << " falling back to face-normal comparison" << endl;
+        }
+        label n0Faces = 0;
+        half0ToPatch.setSize(pp.size());
+
+        label n1Faces = 0;
+        half1ToPatch.setSize(pp.size());
+
+        // Compare to face 0 normal.
+        forAll(faceNormals, faceI)
+        {
+            if ((faceNormals[faceI] & faceNormals[0]) > 0)
+            {
+                half0ToPatch[n0Faces++] = faceI;
+            }
+            else
+            {
+                half1ToPatch[n1Faces++] = faceI;
+            }
+        }
+        half0ToPatch.setSize(n0Faces);
+        half1ToPatch.setSize(n1Faces);
+
+        if (debug)
+        {
+            Pout<< "oldCyclicPolyPatch::getGeometricHalves :"
+                << " Number of faces per zone:("
+                << n0Faces << ' ' << n1Faces << ')' << endl;
+        }
+    }
+
+    if (half0ToPatch.size() != half1ToPatch.size())
+    {
+        fileName casePath(boundaryMesh().mesh().time().path());
+
+        // Dump halves
+        {
+            fileName nm0(casePath/name()+"_half0_faces.obj");
+            Pout<< "oldCyclicPolyPatch::getGeometricHalves : Writing half0"
+                << " faces to OBJ file " << nm0 << endl;
+            writeOBJ(nm0, UIndirectList<face>(pp, half0ToPatch)(), pp.points());
+
+            fileName nm1(casePath/name()+"_half1_faces.obj");
+            Pout<< "oldCyclicPolyPatch::getGeometricHalves : Writing half1"
+                << " faces to OBJ file " << nm1 << endl;
+            writeOBJ(nm1, UIndirectList<face>(pp, half1ToPatch)(), pp.points());
+        }
+
+        // Dump face centres
+        {
+            OFstream str0(casePath/name()+"_half0.obj");
+            Pout<< "oldCyclicPolyPatch::getGeometricHalves : Writing half0"
+                << " face centres to OBJ file " << str0.name() << endl;
+
+            forAll(half0ToPatch, i)
+            {
+                writeOBJ(str0, pp[half0ToPatch[i]].centre(pp.points()));
+            }
+
+            OFstream str1(casePath/name()+"_half1.obj");
+            Pout<< "oldCyclicPolyPatch::getGeometricHalves : Writing half1"
+                << " face centres to OBJ file " << str1.name() << endl;
+            forAll(half1ToPatch, i)
+            {
+                writeOBJ(str1, pp[half1ToPatch[i]].centre(pp.points()));
+            }
+        }
+
+        SeriousErrorIn
+        (
+            "oldCyclicPolyPatch::getGeometricHalves"
+            "(const primitivePatch&, labelList&, labelList&) const"
+        )   << "Patch " << name() << " gets decomposed in two zones of"
+            << "inequal size: " << half0ToPatch.size()
+            << " and " << half1ToPatch.size() << endl
+            << "This means that the patch is either not two separate regions"
+            << " or one region where the angle between the different regions"
+            << " is not sufficiently sharp." << endl
+            << "Please adapt the featureCos setting." << endl
+            << "Continuing with incorrect face ordering from now on!" << endl;
+
+        return false;
+    }
+    else
+    {
+        return true;
+    }
+}
+
+
+// Given a split of faces into left and right half calculate the centres
+// and anchor points. Transform the left points so they align with the
+// right ones.
+void Foam::oldCyclicPolyPatch::getCentresAndAnchors
+(
+    const primitivePatch& pp,
+    const faceList& half0Faces,
+    const faceList& half1Faces,
+
+    pointField& ppPoints,
+    pointField& half0Ctrs,
+    pointField& half1Ctrs,
+    pointField& anchors0,
+    scalarField& tols
+) const
+{
+    // Get geometric data on both halves.
+    half0Ctrs = calcFaceCentres(half0Faces, pp.points());
+    anchors0 = getAnchorPoints(half0Faces, pp.points());
+    half1Ctrs = calcFaceCentres(half1Faces, pp.points());
+
+    switch (transform_)
+    {
+        case ROTATIONAL:
+        {
+            label face0 = getConsistentRotationFace(half0Ctrs);
+            label face1 = getConsistentRotationFace(half1Ctrs);
+
+            vector n0 = ((half0Ctrs[face0] - rotationCentre_) ^ rotationAxis_);
+            vector n1 = ((half1Ctrs[face1] - rotationCentre_) ^ -rotationAxis_);
+            n0 /= mag(n0) + VSMALL;
+            n1 /= mag(n1) + VSMALL;
+
+            if (debug)
+            {
+                Pout<< "oldCyclicPolyPatch::getCentresAndAnchors :"
+                    << " Specified rotation :"
+                    << " n0:" << n0 << " n1:" << n1 << endl;
+            }
+
+            // Rotation (around origin)
+            const tensor reverseT(rotationTensor(n0, -n1));
+
+            // Rotation
+            forAll(half0Ctrs, faceI)
+            {
+                half0Ctrs[faceI] = Foam::transform(reverseT, half0Ctrs[faceI]);
+                anchors0[faceI] = Foam::transform(reverseT, anchors0[faceI]);
+            }
+
+            ppPoints = Foam::transform(reverseT, pp.points());
+
+            break;
+        }
+        //- Problem: usually specified translation is not accurate enough
+        //- to get proper match so keep automatic determination over here.
+        //case TRANSLATIONAL:
+        //{
+        //    // Transform 0 points.
+        //
+        //    if (debug)
+        //    {
+        //        Pout<< "oldCyclicPolyPatch::getCentresAndAnchors :"
+        //            << "Specified translation : " << separationVector_
+        //            << endl;
+        //    }
+        //
+        //    half0Ctrs += separationVector_;
+        //    anchors0 += separationVector_;
+        //    break;
+        //}
+        default:
+        {
+            // Assumes that cyclic is planar. This is also the initial
+            // condition for patches without faces.
+
+            // Determine the face with max area on both halves. These
+            // two faces are used to determine the transformation tensors
+            label max0I = findMaxArea(pp.points(), half0Faces);
+            vector n0 = half0Faces[max0I].normal(pp.points());
+            n0 /= mag(n0) + VSMALL;
+
+            label max1I = findMaxArea(pp.points(), half1Faces);
+            vector n1 = half1Faces[max1I].normal(pp.points());
+            n1 /= mag(n1) + VSMALL;
+
+            if (mag(n0 & n1) < 1-coupledPolyPatch::matchTol)
+            {
+                if (debug)
+                {
+                    Pout<< "oldCyclicPolyPatch::getCentresAndAnchors :"
+                        << " Detected rotation :"
+                        << " n0:" << n0 << " n1:" << n1 << endl;
+                }
+
+                // Rotation (around origin)
+                const tensor reverseT(rotationTensor(n0, -n1));
+
+                // Rotation
+                forAll(half0Ctrs, faceI)
+                {
+                    half0Ctrs[faceI] = Foam::transform
+                    (
+                        reverseT,
+                        half0Ctrs[faceI]
+                    );
+                    anchors0[faceI] = Foam::transform
+                    (
+                        reverseT,
+                        anchors0[faceI]
+                    );
+                }
+                ppPoints = Foam::transform(reverseT, pp.points());
+            }
+            else
+            {
+                // Parallel translation. Get average of all used points.
+
+                primitiveFacePatch half0(half0Faces, pp.points());
+                const pointField& half0Pts = half0.localPoints();
+                const point ctr0(sum(half0Pts)/half0Pts.size());
+
+                primitiveFacePatch half1(half1Faces, pp.points());
+                const pointField& half1Pts = half1.localPoints();
+                const point ctr1(sum(half1Pts)/half1Pts.size());
+
+                if (debug)
+                {
+                    Pout<< "oldCyclicPolyPatch::getCentresAndAnchors :"
+                        << " Detected translation :"
+                        << " n0:" << n0 << " n1:" << n1
+                        << " ctr0:" << ctr0 << " ctr1:" << ctr1 << endl;
+                }
+
+                half0Ctrs += ctr1 - ctr0;
+                anchors0 += ctr1 - ctr0;
+                ppPoints = pp.points() + ctr1 - ctr0;
+            }
+            break;
+        }
+    }
+
+
+    // Calculate typical distance per face
+    tols = calcFaceTol(half1Faces, pp.points(), half1Ctrs);
+}
+
+
+// Calculates faceMap and rotation. Returns true if all ok.
+bool Foam::oldCyclicPolyPatch::matchAnchors
+(
+    const bool report,
+    const primitivePatch& pp,
+    const labelList& half0ToPatch,
+    const pointField& anchors0,
+
+    const labelList& half1ToPatch,
+    const faceList& half1Faces,
+    const labelList& from1To0,
+
+    const scalarField& tols,
+
+    labelList& faceMap,
+    labelList& rotation
+) const
+{
+    // Set faceMap such that half0 faces get first and corresponding half1
+    // faces last.
+
+    forAll(half0ToPatch, half0FaceI)
+    {
+        // Label in original patch
+        label patchFaceI = half0ToPatch[half0FaceI];
+
+        faceMap[patchFaceI] = half0FaceI;
+
+        // No rotation
+        rotation[patchFaceI] = 0;
+    }
+
+    bool fullMatch = true;
+
+    forAll(from1To0, half1FaceI)
+    {
+        label patchFaceI = half1ToPatch[half1FaceI];
+
+        // This face has to match the corresponding one on half0.
+        label half0FaceI = from1To0[half1FaceI];
+
+        label newFaceI = half0FaceI + pp.size()/2;
+
+        faceMap[patchFaceI] = newFaceI;
+
+        // Rotate patchFaceI such that its f[0] aligns with that of
+        // the corresponding face
+        // (which after shuffling will be at position half0FaceI)
+
+        const point& wantedAnchor = anchors0[half0FaceI];
+
+        rotation[newFaceI] = getRotation
+        (
+            pp.points(),
+            half1Faces[half1FaceI],
+            wantedAnchor,
+            tols[half1FaceI]
+        );
+
+        if (rotation[newFaceI] == -1)
+        {
+            fullMatch = false;
+
+            if (report)
+            {
+                const face& f = half1Faces[half1FaceI];
+                SeriousErrorIn
+                (
+                    "oldCyclicPolyPatch::matchAnchors(..)"
+                )   << "Patch:" << name() << " : "
+                    << "Cannot find point on face " << f
+                    << " with vertices:"
+                    << UIndirectList<point>(pp.points(), f)()
+                    << " that matches point " << wantedAnchor
+                    << " when matching the halves of cyclic patch " << name()
+                    << endl
+                    << "Continuing with incorrect face ordering from now on!"
+                    << endl;
+            }
+        }
+    }
+    return fullMatch;
+}
+
+
+Foam::label Foam::oldCyclicPolyPatch::getConsistentRotationFace
+(
+    const pointField& faceCentres
+) const
+{
+    const scalarField magRadSqr =
+        magSqr((faceCentres - rotationCentre_) ^ rotationAxis_);
+    scalarField axisLen = (faceCentres - rotationCentre_) & rotationAxis_;
+    axisLen = axisLen - min(axisLen);
+    const scalarField magLenSqr = magRadSqr + axisLen*axisLen;
+
+    label rotFace = -1;
+    scalar maxMagLenSqr = -GREAT;
+    scalar maxMagRadSqr = -GREAT;
+    forAll(faceCentres, i)
+    {
+        if (magLenSqr[i] >= maxMagLenSqr)
+        {
+            if (magRadSqr[i] > maxMagRadSqr)
+            {
+                rotFace = i;
+                maxMagLenSqr = magLenSqr[i];
+                maxMagRadSqr = magRadSqr[i];
+            }
+        }
+    }
+
+    if (debug)
+    {
+        Info<< "getConsistentRotationFace(const pointField&)" << nl
+            << "    rotFace = " << rotFace << nl
+            << "    point =  " << faceCentres[rotFace] << endl;
+    }
+
+    return rotFace;
+}
+
+
+// * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * * * * //
+
+Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
+(
+    const word& name,
+    const label size,
+    const label start,
+    const label index,
+    const polyBoundaryMesh& bm
+)
+:
+    coupledPolyPatch(name, size, start, index, bm),
+    featureCos_(0.9),
+    transform_(UNKNOWN),
+    rotationAxis_(vector::zero),
+    rotationCentre_(point::zero),
+    separationVector_(vector::zero)
+{}
+
+
+Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
+(
+    const word& name,
+    const dictionary& dict,
+    const label index,
+    const polyBoundaryMesh& bm
+)
+:
+    coupledPolyPatch(name, dict, index, bm),
+    featureCos_(0.9),
+    transform_(UNKNOWN),
+    rotationAxis_(vector::zero),
+    rotationCentre_(point::zero),
+    separationVector_(vector::zero)
+{
+    if (dict.found("neighbourPatch"))
+    {
+        FatalIOErrorIn
+        (
+            "oldCyclicPolyPatch::oldCyclicPolyPatch\n"
+            "(\n"
+            "    const word& name,\n"
+            "    const dictionary& dict,\n"
+            "    const label index,\n"
+            "    const polyBoundaryMesh& bm\n"
+            ")",
+            dict
+        )   << "Found \"neighbourPatch\" entry when reading cyclic patch "
+            << name << endl
+            << "Is this mesh already with split cyclics?" << endl
+            << "If so run a newer version that supports it"
+            << ", if not comment out the \"neighbourPatch\" entry and re-run"
+            << exit(FatalIOError);
+    }
+
+    dict.readIfPresent("featureCos", featureCos_);
+
+    if (dict.found("transform"))
+    {
+        transform_ = transformTypeNames.read(dict.lookup("transform"));
+        switch (transform_)
+        {
+            case ROTATIONAL:
+            {
+                dict.lookup("rotationAxis") >> rotationAxis_;
+                dict.lookup("rotationCentre") >> rotationCentre_;
+                break;
+            }
+            case TRANSLATIONAL:
+            {
+                dict.lookup("separationVector") >> separationVector_;
+                break;
+            }
+            default:
+            {
+                // no additional info required
+            }
+        }
+    }
+}
+
+
+Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
+(
+    const oldCyclicPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    coupledPolyPatch(pp, bm),
+    featureCos_(pp.featureCos_),
+    transform_(pp.transform_),
+    rotationAxis_(pp.rotationAxis_),
+    rotationCentre_(pp.rotationCentre_),
+    separationVector_(pp.separationVector_)
+{}
+
+
+Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
+(
+    const oldCyclicPolyPatch& pp,
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
+)
+:
+    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    featureCos_(pp.featureCos_),
+    transform_(pp.transform_),
+    rotationAxis_(pp.rotationAxis_),
+    rotationCentre_(pp.rotationCentre_),
+    separationVector_(pp.separationVector_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::oldCyclicPolyPatch::~oldCyclicPolyPatch()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::oldCyclicPolyPatch::initGeometry(PstreamBuffers& pBufs)
+{
+    polyPatch::initGeometry(pBufs);
+}
+
+
+void Foam::oldCyclicPolyPatch::calcGeometry
+(
+    const primitivePatch& referPatch,
+    const UList<point>& thisCtrs,
+    const UList<point>& thisAreas,
+    const UList<point>& thisCc,
+    const UList<point>& nbrCtrs,
+    const UList<point>& nbrAreas,
+    const UList<point>& nbrCc
+)
+{}
+
+
+void Foam::oldCyclicPolyPatch::calcGeometry(PstreamBuffers& pBufs)
+{}
+
+
+void Foam::oldCyclicPolyPatch::initMovePoints
+(
+    PstreamBuffers& pBufs,
+    const pointField& p
+)
+{
+    polyPatch::initMovePoints(pBufs, p);
+}
+
+
+void Foam::oldCyclicPolyPatch::movePoints
+(
+    PstreamBuffers& pBufs,
+    const pointField& p
+)
+{
+    polyPatch::movePoints(pBufs, p);
+}
+
+
+void Foam::oldCyclicPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+{
+    polyPatch::initUpdateMesh(pBufs);
+}
+
+
+void Foam::oldCyclicPolyPatch::updateMesh(PstreamBuffers& pBufs)
+{
+    polyPatch::updateMesh(pBufs);
+}
+
+
+void Foam::oldCyclicPolyPatch::initOrder
+(
+    PstreamBuffers&,
+    const primitivePatch& pp
+) const
+{}
+
+
+//  Return new ordering. Ordering is -faceMap: for every face index
+//  the new face -rotation:for every new face the clockwise shift
+//  of the original face. Return false if nothing changes (faceMap
+//  is identity, rotation is 0)
+bool Foam::oldCyclicPolyPatch::order
+(
+    PstreamBuffers&,
+    const primitivePatch& pp,
+    labelList& faceMap,
+    labelList& rotation
+) const
+{
+    faceMap.setSize(pp.size());
+    faceMap = -1;
+
+    rotation.setSize(pp.size());
+    rotation = 0;
+
+    if (pp.empty())
+    {
+        // No faces, nothing to change.
+        return false;
+    }
+
+    if (pp.size()&1)
+    {
+        FatalErrorIn("oldCyclicPolyPatch::order(..)")
+            << "Size of cyclic " << name() << " should be a multiple of 2"
+            << ". It is " << pp.size() << abort(FatalError);
+    }
+
+    label halfSize = pp.size()/2;
+
+    // Supplied primitivePatch already with new points.
+    // Cyclics are limited to one transformation tensor
+    // currently anyway (i.e. straight plane) so should not be too big a
+    // problem.
+
+
+    // Indices of faces on half0
+    labelList half0ToPatch;
+    // Indices of faces on half1
+    labelList half1ToPatch;
+
+
+    // 1. Test if already correctly oriented by starting from trivial ordering.
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    half0ToPatch = identity(halfSize);
+    half1ToPatch = half0ToPatch + halfSize;
+
+    // Get faces
+    faceList half0Faces(UIndirectList<face>(pp, half0ToPatch));
+    faceList half1Faces(UIndirectList<face>(pp, half1ToPatch));
+
+    // Get geometric quantities
+    pointField half0Ctrs, half1Ctrs, anchors0, ppPoints;
+    scalarField tols;
+    getCentresAndAnchors
+    (
+        pp,
+        half0Faces,
+        half1Faces,
+
+        ppPoints,
+        half0Ctrs,
+        half1Ctrs,
+        anchors0,
+        tols
+    );
+
+    // Geometric match of face centre vectors
+    labelList from1To0;
+    bool matchedAll = matchPoints
+    (
+        half1Ctrs,
+        half0Ctrs,
+        tols,
+        false,
+        from1To0
+    );
+
+    if (debug)
+    {
+        Pout<< "oldCyclicPolyPatch::order : test if already ordered:"
+            << matchedAll << endl;
+
+        // Dump halves
+        fileName nm0("match1_"+name()+"_half0_faces.obj");
+        Pout<< "oldCyclicPolyPatch::order : Writing half0"
+            << " faces to OBJ file " << nm0 << endl;
+        writeOBJ(nm0, half0Faces, ppPoints);
+
+        fileName nm1("match1_"+name()+"_half1_faces.obj");
+        Pout<< "oldCyclicPolyPatch::order : Writing half1"
+            << " faces to OBJ file " << nm1 << endl;
+        writeOBJ(nm1, half1Faces, pp.points());
+
+        OFstream ccStr
+        (
+            boundaryMesh().mesh().time().path()
+           /"match1_"+ name() + "_faceCentres.obj"
+        );
+        Pout<< "oldCyclicPolyPatch::order : "
+            << "Dumping currently found cyclic match as lines between"
+            << " corresponding face centres to file " << ccStr.name()
+            << endl;
+
+        // Recalculate untransformed face centres
+        //pointField rawHalf0Ctrs = calcFaceCentres(half0Faces, pp.points());
+        label vertI = 0;
+
+        forAll(half1Ctrs, i)
+        {
+            //if (from1To0[i] != -1)
+            {
+                // Write edge between c1 and c0
+                //const point& c0 = rawHalf0Ctrs[from1To0[i]];
+                //const point& c0 = half0Ctrs[from1To0[i]];
+                const point& c0 = half0Ctrs[i];
+                const point& c1 = half1Ctrs[i];
+                writeOBJ(ccStr, c0, c1, vertI);
+            }
+        }
+    }
+
+
+    // 2. Ordered in pairs (so 0,1 coupled and 2,3 etc.)
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    if (!matchedAll)
+    {
+        label faceI = 0;
+        for (label i = 0; i < halfSize; i++)
+        {
+            half0ToPatch[i] = faceI++;
+            half1ToPatch[i] = faceI++;
+        }
+
+        // And redo all matching
+        half0Faces = UIndirectList<face>(pp, half0ToPatch);
+        half1Faces = UIndirectList<face>(pp, half1ToPatch);
+
+        getCentresAndAnchors
+        (
+            pp,
+            half0Faces,
+            half1Faces,
+
+            ppPoints,
+            half0Ctrs,
+            half1Ctrs,
+            anchors0,
+            tols
+        );
+
+        // Geometric match of face centre vectors
+        matchedAll = matchPoints
+        (
+            half1Ctrs,
+            half0Ctrs,
+            tols,
+            false,
+            from1To0
+        );
+
+        if (debug)
+        {
+            Pout<< "oldCyclicPolyPatch::order : test if pairwise ordered:"
+                << matchedAll << endl;
+            // Dump halves
+            fileName nm0("match2_"+name()+"_half0_faces.obj");
+            Pout<< "oldCyclicPolyPatch::order : Writing half0"
+                << " faces to OBJ file " << nm0 << endl;
+            writeOBJ(nm0, half0Faces, ppPoints);
+
+            fileName nm1("match2_"+name()+"_half1_faces.obj");
+            Pout<< "oldCyclicPolyPatch::order : Writing half1"
+                << " faces to OBJ file " << nm1 << endl;
+            writeOBJ(nm1, half1Faces, pp.points());
+
+            OFstream ccStr
+            (
+                boundaryMesh().mesh().time().path()
+               /"match2_"+name()+"_faceCentres.obj"
+            );
+            Pout<< "oldCyclicPolyPatch::order : "
+                << "Dumping currently found cyclic match as lines between"
+                << " corresponding face centres to file " << ccStr.name()
+                << endl;
+
+            // Recalculate untransformed face centres
+            label vertI = 0;
+
+            forAll(half1Ctrs, i)
+            {
+                if (from1To0[i] != -1)
+                {
+                    // Write edge between c1 and c0
+                    const point& c0 = half0Ctrs[from1To0[i]];
+                    const point& c1 = half1Ctrs[i];
+                    writeOBJ(ccStr, c0, c1, vertI);
+                }
+            }
+        }
+    }
+
+
+    // 3. Baffles(coincident faces) converted into cyclics (e.g. jump)
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    if (!matchedAll)
+    {
+        label baffleI = 0;
+
+        forAll(pp, faceI)
+        {
+            const face& f = pp.localFaces()[faceI];
+            const labelList& pFaces = pp.pointFaces()[f[0]];
+
+            label matchedFaceI = -1;
+
+            forAll(pFaces, i)
+            {
+                label otherFaceI = pFaces[i];
+
+                if (otherFaceI > faceI)
+                {
+                    const face& otherF = pp.localFaces()[otherFaceI];
+
+                    // Note: might pick up two similar oriented faces
+                    //       (but that is illegal anyway)
+                    if (f == otherF)
+                    {
+                        matchedFaceI = otherFaceI;
+                        break;
+                    }
+                }
+            }
+
+            if (matchedFaceI != -1)
+            {
+                half0ToPatch[baffleI] = faceI;
+                half1ToPatch[baffleI] = matchedFaceI;
+                baffleI++;
+            }
+        }
+
+        if (baffleI == halfSize)
+        {
+            // And redo all matching
+            half0Faces = UIndirectList<face>(pp, half0ToPatch);
+            half1Faces = UIndirectList<face>(pp, half1ToPatch);
+
+            getCentresAndAnchors
+            (
+                pp,
+                half0Faces,
+                half1Faces,
+
+                ppPoints,
+                half0Ctrs,
+                half1Ctrs,
+                anchors0,
+                tols
+            );
+
+            // Geometric match of face centre vectors
+            matchedAll = matchPoints
+            (
+                half1Ctrs,
+                half0Ctrs,
+                tols,
+                false,
+                from1To0
+            );
+
+            if (debug)
+            {
+                Pout<< "oldCyclicPolyPatch::order : test if baffles:"
+                    << matchedAll << endl;
+                // Dump halves
+                fileName nm0("match3_"+name()+"_half0_faces.obj");
+                Pout<< "oldCyclicPolyPatch::order : Writing half0"
+                    << " faces to OBJ file " << nm0 << endl;
+                writeOBJ(nm0, half0Faces, ppPoints);
+
+                fileName nm1("match3_"+name()+"_half1_faces.obj");
+                Pout<< "oldCyclicPolyPatch::order : Writing half1"
+                    << " faces to OBJ file " << nm1 << endl;
+                writeOBJ(nm1, half1Faces, pp.points());
+
+                OFstream ccStr
+                (
+                    boundaryMesh().mesh().time().path()
+                   /"match3_"+ name() + "_faceCentres.obj"
+                );
+                Pout<< "oldCyclicPolyPatch::order : "
+                    << "Dumping currently found cyclic match as lines between"
+                    << " corresponding face centres to file " << ccStr.name()
+                    << endl;
+
+                // Recalculate untransformed face centres
+                label vertI = 0;
+
+                forAll(half1Ctrs, i)
+                {
+                    if (from1To0[i] != -1)
+                    {
+                        // Write edge between c1 and c0
+                        const point& c0 = half0Ctrs[from1To0[i]];
+                        const point& c1 = half1Ctrs[i];
+                        writeOBJ(ccStr, c0, c1, vertI);
+                    }
+                }
+            }
+        }
+    }
+
+
+    // 4. Automatic geometric ordering
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    if (!matchedAll)
+    {
+        // Split faces according to feature angle or topology
+        bool okSplit = getGeometricHalves(pp, half0ToPatch, half1ToPatch);
+
+        if (!okSplit)
+        {
+            // Did not split into two equal parts.
+            return false;
+        }
+
+        // And redo all matching
+        half0Faces = UIndirectList<face>(pp, half0ToPatch);
+        half1Faces = UIndirectList<face>(pp, half1ToPatch);
+
+        getCentresAndAnchors
+        (
+            pp,
+            half0Faces,
+            half1Faces,
+
+            ppPoints,
+            half0Ctrs,
+            half1Ctrs,
+            anchors0,
+            tols
+        );
+
+        // Geometric match of face centre vectors
+        matchedAll = matchPoints
+        (
+            half1Ctrs,
+            half0Ctrs,
+            tols,
+            false,
+            from1To0
+        );
+
+        if (debug)
+        {
+            Pout<< "oldCyclicPolyPatch::order : automatic ordering result:"
+                << matchedAll << endl;
+            // Dump halves
+            fileName nm0("match4_"+name()+"_half0_faces.obj");
+            Pout<< "oldCyclicPolyPatch::order : Writing half0"
+                << " faces to OBJ file " << nm0 << endl;
+            writeOBJ(nm0, half0Faces, ppPoints);
+
+            fileName nm1("match4_"+name()+"_half1_faces.obj");
+            Pout<< "oldCyclicPolyPatch::order : Writing half1"
+                << " faces to OBJ file " << nm1 << endl;
+            writeOBJ(nm1, half1Faces, pp.points());
+
+            OFstream ccStr
+            (
+                boundaryMesh().mesh().time().path()
+               /"match4_"+ name() + "_faceCentres.obj"
+            );
+            Pout<< "oldCyclicPolyPatch::order : "
+                << "Dumping currently found cyclic match as lines between"
+                << " corresponding face centres to file " << ccStr.name()
+                << endl;
+
+            // Recalculate untransformed face centres
+            label vertI = 0;
+
+            forAll(half1Ctrs, i)
+            {
+                if (from1To0[i] != -1)
+                {
+                    // Write edge between c1 and c0
+                    const point& c0 = half0Ctrs[from1To0[i]];
+                    const point& c1 = half1Ctrs[i];
+                    writeOBJ(ccStr, c0, c1, vertI);
+                }
+            }
+        }
+    }
+
+
+    if (!matchedAll || debug)
+    {
+        // Dump halves
+        fileName nm0(name()+"_half0_faces.obj");
+        Pout<< "oldCyclicPolyPatch::order : Writing half0"
+            << " faces to OBJ file " << nm0 << endl;
+        writeOBJ(nm0, half0Faces, pp.points());
+
+        fileName nm1(name()+"_half1_faces.obj");
+        Pout<< "oldCyclicPolyPatch::order : Writing half1"
+            << " faces to OBJ file " << nm1 << endl;
+        writeOBJ(nm1, half1Faces, pp.points());
+
+        OFstream ccStr
+        (
+            boundaryMesh().mesh().time().path()
+           /name() + "_faceCentres.obj"
+        );
+        Pout<< "oldCyclicPolyPatch::order : "
+            << "Dumping currently found cyclic match as lines between"
+            << " corresponding face centres to file " << ccStr.name()
+            << endl;
+
+        // Recalculate untransformed face centres
+        //pointField rawHalf0Ctrs = calcFaceCentres(half0Faces, pp.points());
+        label vertI = 0;
+
+        forAll(half1Ctrs, i)
+        {
+            if (from1To0[i] != -1)
+            {
+                // Write edge between c1 and c0
+                //const point& c0 = rawHalf0Ctrs[from1To0[i]];
+                const point& c0 = half0Ctrs[from1To0[i]];
+                const point& c1 = half1Ctrs[i];
+                writeOBJ(ccStr, c0, c1, vertI);
+            }
+        }
+    }
+
+
+    if (!matchedAll)
+    {
+        SeriousErrorIn
+        (
+            "oldCyclicPolyPatch::order"
+            "(const primitivePatch&, labelList&, labelList&) const"
+        )   << "Patch:" << name() << " : "
+            << "Cannot match vectors to faces on both sides of patch" << endl
+            << "    Perhaps your faces do not match?"
+            << " The obj files written contain the current match." << endl
+            << "    Continuing with incorrect face ordering from now on!"
+            << endl;
+
+            return false;
+    }
+
+
+    // Set faceMap such that half0 faces get first and corresponding half1
+    // faces last.
+    matchAnchors
+    (
+        true,                   // report if anchor matching error
+        pp,
+        half0ToPatch,
+        anchors0,
+        half1ToPatch,
+        half1Faces,
+        from1To0,
+        tols,
+        faceMap,
+        rotation
+    );
+
+    // Return false if no change neccesary, true otherwise.
+
+    forAll(faceMap, faceI)
+    {
+        if (faceMap[faceI] != faceI || rotation[faceI] != 0)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+void Foam::oldCyclicPolyPatch::write(Ostream& os) const
+{
+    // Replacement of polyPatch::write to write 'cyclic' instead of type():
+    os.writeKeyword("type") << cyclicPolyPatch::typeName
+        << token::END_STATEMENT << nl;
+    patchIdentifier::write(os);
+    os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl;
+    os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl;
+
+
+    os.writeKeyword("featureCos") << featureCos_ << token::END_STATEMENT << nl;
+    switch (transform_)
+    {
+        case ROTATIONAL:
+        {
+            os.writeKeyword("transform") << transformTypeNames[transform_]
+                << token::END_STATEMENT << nl;
+            os.writeKeyword("rotationAxis") << rotationAxis_
+                << token::END_STATEMENT << nl;
+            os.writeKeyword("rotationCentre") << rotationCentre_
+                << token::END_STATEMENT << nl;
+            break;
+        }
+        case TRANSLATIONAL:
+        {
+            os.writeKeyword("transform") << transformTypeNames[transform_]
+                << token::END_STATEMENT << nl;
+            os.writeKeyword("separationVector") << separationVector_
+                << token::END_STATEMENT << nl;
+            break;
+        }
+        default:
+        {
+            // no additional info to write
+        }
+    }
+
+    WarningIn("oldCyclicPolyPatch::write(Ostream& os) const")
+        << "Please run foamUpgradeCyclics to convert these old-style"
+        << " cyclics into two separate cyclics patches."
+        << endl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
new file mode 100644
index 0000000000..f8cfb169c0
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
@@ -0,0 +1,318 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+     \\/     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::oldCyclicPolyPatch
+
+Description
+    'old' style cyclic polyPatch with all faces in single patch. Does ordering
+    but cannot be used to run. Writes 'type cyclic' so foamUpgradeCyclics
+    can be run afterwards.
+    Used to get cyclics from mesh converters that assume cyclics in single
+    patch (e.g. fluent3DMeshToFoam)
+
+SourceFiles
+    oldCyclicPolyPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef oldCyclicPolyPatch_H
+#define oldCyclicPolyPatch_H
+
+#include "coupledPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class oldCyclicPolyPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class oldCyclicPolyPatch
+:
+    public coupledPolyPatch
+{
+public:
+
+    enum transformType
+    {
+        UNKNOWN,
+        ROTATIONAL,
+        TRANSLATIONAL
+    };
+    static const NamedEnum<transformType, 3> transformTypeNames;
+
+
+private:
+
+    // Private data
+
+        //- Morph:angle between normals of neighbouring faces.
+        //  Used to split cyclic into halves.
+        scalar featureCos_;
+
+        //- Type of transformation - rotational or translational
+        transformType transform_;
+
+        // For rotation
+
+            //- Axis of rotation for rotational cyclics
+            vector rotationAxis_;
+
+            //- point on axis of rotation for rotational cyclics
+            point rotationCentre_;
+
+        // For translation
+
+            //- Translation vector
+            vector separationVector_;
+
+
+    // Private member functions
+
+        //- Find amongst selected faces the one with the largest area
+        static label findMaxArea(const pointField&, const faceList&);
+
+        void calcTransforms();
+
+        //- Calculate face centres
+        static pointField calcFaceCentres
+        (
+            const UList<face>&,
+            const pointField&
+        );
+
+        //- Get f[0] for all faces
+        static pointField getAnchorPoints
+        (
+            const UList<face>&,
+            const pointField&
+        );
+
+        // Face ordering
+
+            //- Find the two parts of the faces of pp using feature edges.
+            //  Returns true if successfull.
+            bool getGeometricHalves
+            (
+                const primitivePatch&,
+                labelList&,
+                labelList&
+            ) const;
+
+            //- Calculate geometric factors of the two halves.
+            void getCentresAndAnchors
+            (
+                const primitivePatch&,
+                const faceList& half0Faces,
+                const faceList& half1Faces,
+
+                pointField& ppPoints,
+                pointField& half0Ctrs,
+                pointField& half1Ctrs,
+                pointField& anchors0,
+                scalarField& tols
+            ) const;
+
+            //- Given matched faces matches the anchor point. Sets faceMap,
+            //  rotation. Returns true if all matched.
+            bool matchAnchors
+            (
+                const bool report,
+                const primitivePatch&,
+                const labelList&,
+                const pointField&,
+                const labelList&,
+                const faceList&,
+                const labelList&,
+                const scalarField&,
+
+                labelList& faceMap,
+                labelList& rotation
+            ) const;
+
+            //- For rotational cases, try to find a unique face on each side
+            //  of the cyclic.
+            label getConsistentRotationFace
+            (
+                const pointField& faceCentres
+            ) const;
+
+
+protected:
+
+    // Protected Member functions
+
+        //- Initialise the calculation of the patch geometry
+        virtual void initGeometry(PstreamBuffers&);
+
+        //- Calculate the patch geometry
+        virtual void calcGeometry(PstreamBuffers&);
+
+        //- Initialise the patches for moving points
+        virtual void initMovePoints(PstreamBuffers&, const pointField&);
+
+        //- Correct patches after moving points
+        virtual void movePoints(PstreamBuffers&, const pointField&);
+
+        //- Initialise the update of the patch topology
+        virtual void initUpdateMesh(PstreamBuffers&);
+
+        //- Update of the patch topology
+        virtual void updateMesh(PstreamBuffers&);
+
+public:
+
+    //- Runtime type information
+    TypeName("oldCyclic");
+
+
+    // Constructors
+
+        //- Construct from components
+        oldCyclicPolyPatch
+        (
+            const word& name,
+            const label size,
+            const label start,
+            const label index,
+            const polyBoundaryMesh& bm
+        );
+
+        //- Construct from dictionary
+        oldCyclicPolyPatch
+        (
+            const word& name,
+            const dictionary& dict,
+            const label index,
+            const polyBoundaryMesh& bm
+        );
+
+        //- Construct as copy, resetting the boundary mesh
+        oldCyclicPolyPatch(const oldCyclicPolyPatch&, const polyBoundaryMesh&);
+
+        //- Construct given the original patch and resetting the
+        //  face list and boundary mesh information
+        oldCyclicPolyPatch
+        (
+            const oldCyclicPolyPatch& pp,
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        );
+
+        //- Construct and return a clone, resetting the boundary mesh
+        virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
+        {
+            return autoPtr<polyPatch>(new oldCyclicPolyPatch(*this, bm));
+        }
+
+        //- Construct and return a clone, resetting the face list
+        //  and boundary mesh
+        virtual autoPtr<polyPatch> clone
+        (
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        ) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new oldCyclicPolyPatch(*this, bm, index, newSize, newStart)
+            );
+        }
+
+
+    // Destructor
+
+        virtual ~oldCyclicPolyPatch();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Does this side own the patch ?
+            virtual bool owner() const
+            {
+                notImplemented("oldCyclicPolyPatch::owner()");
+                return true;
+            }
+
+            //- Transform a patch-based position from other side to this side
+            virtual void transformPosition(pointField& l) const
+            {
+                notImplemented("transformPosition(pointField&)");
+            }
+
+        //- Calculate the patch geometry
+        virtual void calcGeometry
+        (
+            const primitivePatch& referPatch,
+            const UList<point>& thisCtrs,
+            const UList<point>& thisAreas,
+            const UList<point>& thisCc,
+            const UList<point>& nbrCtrs,
+            const UList<point>& nbrAreas,
+            const UList<point>& nbrCc
+        );
+
+        //- Initialize ordering for primitivePatch. Does not
+        //  refer to *this (except for name() and type() etc.)
+        virtual void initOrder
+        (
+            PstreamBuffers&,
+            const primitivePatch&
+        ) const;
+
+        //- Return new ordering for primitivePatch.
+        //  Ordering is -faceMap: for every face
+        //  index of the new face -rotation:for every new face the clockwise
+        //  shift of the original face. Return false if nothing changes
+        //  (faceMap is identity, rotation is 0), true otherwise.
+        virtual bool order
+        (
+            PstreamBuffers&,
+            const primitivePatch&,
+            labelList& faceMap,
+            labelList& rotation
+        ) const;
+
+        //- Write the polyPatch data as a dictionary
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
index 037aa14717..d4834a6ff6 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
@@ -49,7 +49,7 @@ Foam::PatchTools::sortedEdgeFaces
     const Field<PointType>& localPoints = p.localPoints();
 
     // create the lists for the various results. (resized on completion)
-    labelListList& sortedEdgeFaces = labelListList(edgeFaces.size());
+    labelListList sortedEdgeFaces(edgeFaces.size());
 
     forAll(edgeFaces, edgeI)
     {
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C
index abaf9c5015..110754f77a 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C
@@ -29,27 +29,29 @@ License
 
 Foam::scalar Foam::intersection::planarTol_ = 0.2;
 
-template<>
-const char* Foam::NamedEnum<Foam::intersection::direction, 2>::names[] =
+namespace Foam
 {
-    "vector",
-    "contactSphere"
-};
+    template<>
+    const char* Foam::NamedEnum<Foam::intersection::direction, 2>::names[] =
+    {
+        "vector",
+        "contactSphere"
+    };
+
+    template<>
+    const char* Foam::NamedEnum<Foam::intersection::algorithm, 3>::names[] =
+    {
+        "fullRay",
+        "halfRay",
+        "visible"
+    };
+}
 
 const Foam::NamedEnum<Foam::intersection::direction, 2>
 Foam::intersection::directionNames_;
 
-template<>
-const char* Foam::NamedEnum<Foam::intersection::algorithm, 3>::names[] =
-{
-    "fullRay",
-    "halfRay",
-    "visible"
-};
-
 const Foam::NamedEnum<Foam::intersection::algorithm, 3>
 Foam::intersection::algorithmNames_;
 
 
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Lists/boolList.H b/src/OpenFOAM/primitives/Lists/boolList.H
index 32696a3231..84f31f2bc5 100644
--- a/src/OpenFOAM/primitives/Lists/boolList.H
+++ b/src/OpenFOAM/primitives/Lists/boolList.H
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::boolUList
+
+Description
+    A UList of bool
+
 Typedef
     Foam::boolList
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<bool> boolUList;
+
     typedef List<bool> boolList;
     typedef List<List<bool> > boolListList;
 }
diff --git a/src/OpenFOAM/primitives/Lists/fileNameList.H b/src/OpenFOAM/primitives/Lists/fileNameList.H
index 29cb0727ff..4447912795 100644
--- a/src/OpenFOAM/primitives/Lists/fileNameList.H
+++ b/src/OpenFOAM/primitives/Lists/fileNameList.H
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::fileNameUList
+
+Description
+    A UList of fileNames.
+
 Typedef
     Foam::fileNameList
 
 Description
-    List of fileNames.
+    A List of fileNames.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<fileName> fileNameUList;
+
     typedef List<fileName> fileNameList;
 }
 
diff --git a/src/OpenFOAM/primitives/Lists/labelList.H b/src/OpenFOAM/primitives/Lists/labelList.H
index e91e0982f5..f89ba63799 100644
--- a/src/OpenFOAM/primitives/Lists/labelList.H
+++ b/src/OpenFOAM/primitives/Lists/labelList.H
@@ -25,7 +25,19 @@ Typedef
     Foam::labelList
 
 Description
-    Label container classes
+    A List of labels
+
+Typedef
+    Foam::labelListList
+
+Description
+    A List of labelList
+
+Typedef
+    Foam::labelListListList
+
+Description
+    A List of labelListList
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,11 +51,11 @@ Description
 
 namespace Foam
 {
+    // Note: frequently used UList version is located in container itself
+
     typedef List<label> labelList;
     typedef List<labelList> labelListList;
     typedef List<labelListList> labelListListList;
-
-    typedef UList<label> unallocLabelList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Lists/scalarList.H b/src/OpenFOAM/primitives/Lists/scalarList.H
index 5b8091f1b6..e611c9d0fd 100644
--- a/src/OpenFOAM/primitives/Lists/scalarList.H
+++ b/src/OpenFOAM/primitives/Lists/scalarList.H
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::scalarUList
+
+Description
+    A UList of scalars.
+
 Typedef
     Foam::scalarList
 
 Description
-    List of scalars.
+    A List of scalars.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<scalar> scalarUList;
+
     typedef List<scalar> scalarList;
     typedef List<scalarList> scalarListList;
 }
diff --git a/src/OpenFOAM/primitives/Lists/sphericalTensorList.H b/src/OpenFOAM/primitives/Lists/sphericalTensorList.H
index be62ae7306..9a8fc80e57 100644
--- a/src/OpenFOAM/primitives/Lists/sphericalTensorList.H
+++ b/src/OpenFOAM/primitives/Lists/sphericalTensorList.H
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::sphericalTensorUList
+
+Description
+    A UList of sphericalTensors.
+
 Typedef
     Foam::sphericalTensorList
 
 Description
-    List of sphericalTensors.
+    A List of sphericalTensors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<sphericalTensor> sphericalTensorUList;
+
     typedef List<sphericalTensor> sphericalTensorList;
 }
 
diff --git a/src/OpenFOAM/primitives/Lists/stringList.H b/src/OpenFOAM/primitives/Lists/stringList.H
index 6649229d2d..153b41fb92 100644
--- a/src/OpenFOAM/primitives/Lists/stringList.H
+++ b/src/OpenFOAM/primitives/Lists/stringList.H
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::stringUList
+
+Description
+    A UList of strings.
+
 Typedef
     Foam::stringList
 
 Description
-    List of strings.
+    A List of strings.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<string> stringUList;
+
     typedef List<string> stringList;
 }
 
diff --git a/src/OpenFOAM/primitives/Lists/symmTensorList.H b/src/OpenFOAM/primitives/Lists/symmTensorList.H
index e4dd5e9ece..9039e5798d 100644
--- a/src/OpenFOAM/primitives/Lists/symmTensorList.H
+++ b/src/OpenFOAM/primitives/Lists/symmTensorList.H
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::symmTensorUList
+
+Description
+    A UList of symmTensors.
+
 Typedef
     Foam::symmTensorList
 
 Description
-    List of symmTensors.
+    A List of symmTensors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<symmTensor> symmTensorUList;
+
     typedef List<symmTensor> symmTensorList;
 }
 
diff --git a/src/OpenFOAM/primitives/Lists/tensorList.H b/src/OpenFOAM/primitives/Lists/tensorList.H
index 0c22e4e4eb..fd3a7a9f01 100644
--- a/src/OpenFOAM/primitives/Lists/tensorList.H
+++ b/src/OpenFOAM/primitives/Lists/tensorList.H
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::tensorUList
+
+Description
+    A UList of tensors.
+
 Typedef
     Foam::tensorList
 
 Description
-    List of tensors.
+    A List of tensors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<tensor> tensorUList;
+
     typedef List<tensor> tensorList;
 }
 
diff --git a/src/OpenFOAM/primitives/Lists/vectorList.H b/src/OpenFOAM/primitives/Lists/vectorList.H
index 2fd9fc8087..596f828b26 100644
--- a/src/OpenFOAM/primitives/Lists/vectorList.H
+++ b/src/OpenFOAM/primitives/Lists/vectorList.H
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::vectorUList
+
+Description
+    A UList of vectors.
+
 Typedef
     Foam::vectorList
 
 Description
-    List of vectors.
+    A List of vectors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<vector> vectorUList;
+
     typedef List<vector> vectorList;
 }
 
diff --git a/src/OpenFOAM/primitives/Lists/wordList.H b/src/OpenFOAM/primitives/Lists/wordList.H
index 6cd6e71b48..8f9fb26387 100644
--- a/src/OpenFOAM/primitives/Lists/wordList.H
+++ b/src/OpenFOAM/primitives/Lists/wordList.H
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::wordUList
+
+Description
+    A UList of words.
+
 Typedef
     Foam::wordList
 
 Description
-    List of words.
+    A List of words.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<word> wordUList;
+
     typedef List<word> wordList;
 }
 
diff --git a/src/OpenFOAM/primitives/Lists/wordReList.H b/src/OpenFOAM/primitives/Lists/wordReList.H
index eb31391e56..31a4793655 100644
--- a/src/OpenFOAM/primitives/Lists/wordReList.H
+++ b/src/OpenFOAM/primitives/Lists/wordReList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::wordReUList
+
+Description
+    A UList of wordRe (word or regular expression)
+
 Typedef
     Foam::wordReList
 
 Description
-    List of wordRe (word or regular expression)
+    A List of wordRe (word or regular expression)
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<wordRe> wordReUList;
+
     typedef List<wordRe> wordReList;
 }
 
diff --git a/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C b/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C
index 63419832af..e8a189f094 100644
--- a/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C
+++ b/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C
@@ -28,32 +28,35 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char* const Foam::labelTensor::typeName = "labelTensor";
-
-template<>
-const char* Foam::labelTensor::componentNames[] =
+namespace Foam
 {
-    "xx", "xy", "xz",
-    "yx", "yy", "yz",
-    "zx", "zy", "zz"
-};
+    template<>
+    const char* const Foam::labelTensor::typeName = "labelTensor";
 
-template<>
-const Foam::labelTensor Foam::labelTensor::zero
-(
-    0, 0, 0,
-    0, 0, 0,
-    0, 0, 0
-);
+    template<>
+    const char* Foam::labelTensor::componentNames[] =
+    {
+        "xx", "xy", "xz",
+        "yx", "yy", "yz",
+        "zx", "zy", "zz"
+    };
 
-template<>
-const Foam::labelTensor Foam::labelTensor::one
-(
-    1, 1, 1,
-    1, 1, 1,
-    1, 1, 1
-);
+    template<>
+    const Foam::labelTensor Foam::labelTensor::zero
+    (
+        0, 0, 0,
+        0, 0, 0,
+        0, 0, 0
+    );
+
+    template<>
+    const Foam::labelTensor Foam::labelTensor::one
+    (
+        1, 1, 1,
+        1, 1, 1,
+        1, 1, 1
+    );
+}
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
index b7473ee50e..c98da288cf 100644
--- a/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
+++ b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
@@ -27,17 +27,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char* const Foam::labelVector::typeName = "labelVector";
+namespace Foam
+{
+    template<>
+    const char* const Foam::labelVector::typeName = "labelVector";
 
-template<>
-const char* Foam::labelVector::componentNames[] = {"x", "y", "z"};
+    template<>
+    const char* Foam::labelVector::componentNames[] = {"x", "y", "z"};
 
-template<>
-const Foam::labelVector Foam::labelVector::zero(0, 0, 0);
-
-template<>
-const Foam::labelVector Foam::labelVector::one(1, 1, 1);
+    template<>
+    const Foam::labelVector Foam::labelVector::zero(0, 0, 0);
 
+    template<>
+    const Foam::labelVector Foam::labelVector::one(1, 1, 1);
+}
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
index cff3744644..d8569a536c 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
@@ -111,6 +111,15 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
 }
 
 
+template<int PolySize>
+Foam::Polynomial<PolySize>::Polynomial(Istream& is)
+:
+    VectorSpace<Polynomial<PolySize>, scalar, PolySize>(is),
+    logActive_(false),
+    logCoeff_(0.0)
+{}
+
+
 template<int PolySize>
 Foam::Polynomial<PolySize>::Polynomial
 (
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
index f2449d1835..ace90a0bc8 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
@@ -110,6 +110,9 @@ public:
         //- Construct from a list of coefficients
         explicit Polynomial(const UList<scalar>& coeffs);
 
+        //- Construct from Istream
+        Polynomial(Istream& is);
+
         //- Construct from name and Istream
         Polynomial(const word& name, Istream& is);
 
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.C b/src/OpenFOAM/primitives/strings/wordRe/wordRe.C
index 693ae0535d..e0dca4a0a0 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.C
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
index 16d86b7fcf..566f42af6c 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordReI.H b/src/OpenFOAM/primitives/strings/wordRe/wordReI.H
index 7cf6ff6e23..713c003064 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordReI.H
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordReI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicMesh/meshCut/directions/directions.C b/src/dynamicMesh/meshCut/directions/directions.C
index 793323e54d..7024c2ffbc 100644
--- a/src/dynamicMesh/meshCut/directions/directions.C
+++ b/src/dynamicMesh/meshCut/directions/directions.C
@@ -32,22 +32,25 @@ License
 #include "meshTools.H"
 #include "hexMatcher.H"
 #include "Switch.H"
+#include "globalMeshData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char* Foam::NamedEnum<Foam::directions::directionType, 3>::names[] =
+namespace Foam
 {
-    "tan1",
-    "tan2",
-    "normal"
-};
+    template<>
+    const char* Foam::NamedEnum<Foam::directions::directionType, 3>::names[] =
+    {
+        "tan1",
+        "tan2",
+        "normal"
+    };
+}
 
 const Foam::NamedEnum<Foam::directions::directionType, 3>
     Foam::directions::directionTypeNames_;
 
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // For debugging
@@ -204,7 +207,7 @@ Foam::vectorField Foam::directions::propagateDirection
         mesh,
         changedFaces,
         changedFacesInfo,
-        mesh.nCells()
+        mesh.globalData().nTotalCells()+1
     );
 
     const List<directionInfo>& cellInfo = directionCalc.allCellInfo();
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index 9482861bde..c9919351fc 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -2332,7 +2332,7 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
         seedFacesInfo.clear();
 
         // Iterate until no change. Now 2:1 face difference should be satisfied
-        levelCalc.iterate(mesh_.globalData().nTotalFaces());
+        levelCalc.iterate(mesh_.globalData().nTotalFaces()+1);
 
 
         // Now check point-connected cells (face-connected cells already ok):
@@ -2836,7 +2836,7 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement2
         seedFacesInfo,
         allFaceInfo,
         allCellInfo,
-        mesh_.globalData().nTotalCells()
+        mesh_.globalData().nTotalCells()+1
     );
 
 
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index b7bbecdc5c..85fa080750 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -45,17 +45,20 @@ namespace Foam
         slidingInterface,
         dictionary
     );
+
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::slidingInterface::typeOfMatch,
+        2
+    >::names[] =
+    {
+        "integral",
+        "partial"
+    };
 }
 
 
-template<>
-const char* Foam::NamedEnum<Foam::slidingInterface::typeOfMatch, 2>::names[] =
-{
-    "integral",
-    "partial"
-};
-
-
 const Foam::NamedEnum<Foam::slidingInterface::typeOfMatch, 2>
 Foam::slidingInterface::typeOfMatchNames_;
 
diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H
index ef48645d2b..3b1e3a6df1 100644
--- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H
+++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Namespace
+    Foam::porousMedia
+
+Description
+    Namespace for models related to porous media
+
 Class
     Foam::porousZone
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 0010ab4a0a..c3949a6ac0 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -171,6 +171,23 @@ tmp<Field<Type> > cyclicFvPatchField<Type>::patchNeighbourField() const
 }
 
 
+template<class Type>
+const cyclicFvPatchField<Type>& cyclicFvPatchField<Type>::neighbourPatchField()
+const
+{
+    const GeometricField<Type, fvPatchField, volMesh>& fld =
+    static_cast<const GeometricField<Type, fvPatchField, volMesh>&>
+    (
+        this->internalField()
+    );
+
+    return refCast<const cyclicFvPatchField<Type> >
+    (
+        fld.boundaryField()[this->cyclicPatch().neighbPatchID()]
+    );
+}
+
+
 template<class Type>
 void cyclicFvPatchField<Type>::updateInterfaceMatrix
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
index 654bd0831a..198dbab741 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
@@ -150,9 +150,12 @@ public:
 
         // Evaluation functions
 
-            //- Return neighbour coupled given internal cell data
+            //- Return neighbour coupled internal cell data
             tmp<Field<Type> > patchNeighbourField() const;
 
+            //- Return reference to neighbour patchField
+            const cyclicFvPatchField<Type>& neighbourPatchField() const;
+
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C
index 2be7d3be5a..4dd232091d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C
@@ -260,7 +260,7 @@ void directMappedFixedValueFvPatchField<Type>::updateCoeffs()
                 allValues
             );
 
-            newValues = this->patch().patchSlice(allValues);
+            newValues.transfer(allValues);
 
             break;
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.H
index e672c07e92..8d6038913e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.H
@@ -25,7 +25,13 @@ Class
     Foam::directMappedFixedValueFvPatchField
 
 Description
-    Recycles the value at a set of internal faces back to *this.
+    Recycles the value at a set of cells or patch faces back to *this. Can not
+    sample internal faces (since volField not defined on faces).
+
+    mode = NEARESTCELL : sample nearest cell
+    mode = NEARESTPATCHFACE : sample nearest face on selected patch
+    mode = NEARESTFACE : sample nearest face on any patch. Note: does not
+                         warn if nearest actually is on internal face!
 
 SourceFiles
     directMappedFixedValueFvPatchField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
index 17fa6f71fb..36821fe72f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
@@ -198,7 +198,7 @@ void directMappedVelocityFluxFixedValueFvPatchField::updateCoeffs()
                 distMap.constructMap(),
                 allUValues
             );
-            newUValues = patch().patchSlice(allUValues);
+            newUValues.transfer(allUValues);
 
             mapDistribute::distribute
             (
@@ -209,7 +209,7 @@ void directMappedVelocityFluxFixedValueFvPatchField::updateCoeffs()
                 distMap.constructMap(),
                 allPhiValues
             );
-            newPhiValues = patch().patchSlice(allPhiValues);
+            newPhiValues.transfer(allPhiValues);
 
             break;
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.H
index 95f3954a1a..3aecda00c0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.H
@@ -27,6 +27,11 @@ Class
 Description
     Recycles the velocity and flux at a patch to this patch
 
+    mode = NEARESTCELL : sample nearest cell
+    mode = NEARESTPATCHFACE : sample nearest face on selected patch
+    mode = NEARESTFACE : sample nearest face on any patch. Note: does not
+                         warn if nearest actually is on internal face!
+
 SourceFiles
     directMappedVelocityFluxFixedValueFvPatchField.C
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
index 73014e048a..31c51c999d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@@ -140,7 +140,17 @@ public:
             //- Return the "jump" across the patch.
             virtual tmp<Field<Type> > jump() const
             {
-                return jump_;
+                if (this->cyclicPatch().owner())
+                {
+                    return jump_;
+                }
+                else
+                {
+                    return refCast<const fanFvPatchField<Type> >
+                    (
+                        this->neighbourPatchField()
+                    ).jump();
+                }
             }
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
index 187e214310..b12e3d347b 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
@@ -108,7 +108,7 @@ public:
             }
 
             //- Return processor number
-            virtual const cyclicLduInterface& neighbPatch() const
+            virtual const cyclicFvPatch& neighbPatch() const
             {
                 return refCast<const cyclicFvPatch>
                 (
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
index 72531d5cfd..02db9ad941 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
@@ -115,7 +115,7 @@ void Foam::inverseFaceDistanceDiffusivity::correct()
         mesh,
         changedFaces,
         faceDist,
-        mesh.globalData().nTotalCells() // max iterations
+        mesh.globalData().nTotalCells()+1 // max iterations
     );
 
     const List<wallPoint>& faceInfo = waveInfo.allFaceInfo();
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index bd01c8b207..4ad492b064 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -27,15 +27,17 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char* Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>::names[] =
+namespace Foam
 {
-    "gas",
-    "liquid",
-    "solid",
-    "unknown"
-};
-
+    template<>
+    const char* Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>::names[] =
+    {
+        "gas",
+        "liquid",
+        "solid",
+        "unknown"
+    };
+}
 
 const Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>
     Foam::phaseProperties::phaseTypeNames_;
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index ecb0542578..9a91bcccb0 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -34,15 +34,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char*
-Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>::names[] =
+namespace Foam
 {
-    "inside",
-    "outside",
-    "insidePoint",
-    "none"
-};
+    template<>
+    const char*
+    Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>::names[] =
+    {
+        "inside",
+        "outside",
+        "insidePoint",
+        "none"
+    };
+}
+
 
 const Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>
     Foam::refinementSurfaces::areaSelectionAlgoNames;
@@ -388,7 +392,7 @@ Foam::labelList Foam::refinementSurfaces::getClosedNamedSurfaces() const
 }
 
 
-// Get indices of named surfaces with a 
+// Get indices of named surfaces with a
 Foam::labelList Foam::refinementSurfaces::getInsidePointNamedSurfaces() const
 {
     labelList closed(cellZoneNames_.size());
@@ -411,9 +415,9 @@ Foam::labelList Foam::refinementSurfaces::getInsidePointNamedSurfaces() const
 // Foam::labelList Foam::refinementSurfaces::countRegions(const triSurface& s)
 // {
 //     const geometricSurfacePatchList& regions = s.patches();
-// 
+//
 //     labelList nTris(regions.size(), 0);
-// 
+//
 //     forAll(s, triI)
 //     {
 //         nTris[s[triI].region()]++;
@@ -433,15 +437,15 @@ Foam::labelList Foam::refinementSurfaces::getInsidePointNamedSurfaces() const
 // ) const
 // {
 //     const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
-// 
+//
 //     // Get per element the region
 //     labelList region;
 //     geom.getRegion(info, region);
-// 
+//
 //     // Initialise fields to region wise minLevel
 //     minLevelField.setSize(ctrs.size());
 //     minLevelField = -1;
-// 
+//
 //     forAll(minLevelField, i)
 //     {
 //         if (info[i].hit())
@@ -449,12 +453,12 @@ Foam::labelList Foam::refinementSurfaces::getInsidePointNamedSurfaces() const
 //             minLevelField[i] = minLevel(surfI, region[i]);
 //         }
 //     }
-// 
+//
 //     // Find out if triangle inside shell with higher level
 //     // What level does shell want to refine fc to?
 //     labelList shellLevel;
 //     shells.findHigherLevel(ctrs, minLevelField, shellLevel);
-// 
+//
 //     forAll(minLevelField, i)
 //     {
 //         minLevelField[i] = max(minLevelField[i], shellLevel[i]);
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index a723665477..daf1de6ac0 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -322,7 +322,7 @@ void Foam::cellClassification::markCells
         changedFaces,                       // Labels of changed faces
         changedFacesInfo,                   // Information on changed faces
         cellInfoList,                       // Information on all cells
-        mesh_.globalData().nTotalCells()    // max iterations
+        mesh_.globalData().nTotalCells()+1  // max iterations
     );
 
     // Get information out of cellInfoList
diff --git a/src/meshTools/cellDist/patchWave/patchDataWave.C b/src/meshTools/cellDist/patchWave/patchDataWave.C
index bb6da1750d..988b8a0be5 100644
--- a/src/meshTools/cellDist/patchWave/patchDataWave.C
+++ b/src/meshTools/cellDist/patchWave/patchDataWave.C
@@ -225,7 +225,7 @@ void Foam::patchDataWave<TransferType>::correct()
         mesh(),
         changedFaces,
         faceDist,
-        mesh().globalData().nTotalCells() // max iterations
+        mesh().globalData().nTotalCells()+1 // max iterations
     );
 
 
diff --git a/src/meshTools/cellDist/patchWave/patchWave.C b/src/meshTools/cellDist/patchWave/patchWave.C
index 85118da58d..826430b003 100644
--- a/src/meshTools/cellDist/patchWave/patchWave.C
+++ b/src/meshTools/cellDist/patchWave/patchWave.C
@@ -186,7 +186,7 @@ void Foam::patchWave::correct()
         mesh(),
         changedFaces,
         faceDist,
-        mesh().globalData().nTotalCells()   // max iterations
+        mesh().globalData().nTotalCells()+1 // max iterations
     );
 
 
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
index 9d3fd3a622..577f014dee 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
@@ -66,9 +66,9 @@ public:
         //- Mesh items to sample
         enum sampleMode
         {
-            NEARESTCELL,
-            NEARESTPATCHFACE,
-            NEARESTFACE
+            NEARESTCELL,        // nearest cell
+            NEARESTPATCHFACE,   // faces on selected patch
+            NEARESTFACE         // nearest face
         };
 
 private:
@@ -201,7 +201,7 @@ public:
             return sampleRegion_;
         }
 
-        //- Patch (only if NEARESTBOUNDARY)
+        //- Patch (only if NEARESTPATCHFACE)
         const word& samplePatch() const
         {
             return samplePatch_;
diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
index e7061070f8..be35467704 100644
--- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
+++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
@@ -102,6 +102,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
index 7660c4bb83..75fa47c3b1 100644
--- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
+++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
@@ -93,6 +93,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
index 1581e8dcdf..bd67e09c67 100644
--- a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
+++ b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
@@ -109,6 +109,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
index db7cb5269f..9589929aed 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
@@ -33,13 +33,18 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(faceToCell, 0);
+    addToRunTimeSelectionTable(topoSetSource, faceToCell, word);
+    addToRunTimeSelectionTable(topoSetSource, faceToCell, istream);
 
-defineTypeNameAndDebug(faceToCell, 0);
-
-addToRunTimeSelectionTable(topoSetSource, faceToCell, word);
-
-addToRunTimeSelectionTable(topoSetSource, faceToCell, istream);
-
+    template<>
+    const char* Foam::NamedEnum<Foam::faceToCell::faceAction, 4>::names[] =
+    {
+        "neighbour",
+        "owner",
+        "any",
+        "all"
+    };
 }
 
 
@@ -51,15 +56,6 @@ Foam::topoSetSource::addToUsageTable Foam::faceToCell::usage_
     " of the faces in the faceSet or where all faces are in the faceSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::faceToCell::faceAction, 4>::names[] =
-{
-    "neighbour",
-    "owner",
-    "any",
-    "all"
-};
-
 const Foam::NamedEnum<Foam::faceToCell::faceAction, 4>
     Foam::faceToCell::faceActionNames_;
 
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
index 4b1673d35c..768ec475e1 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
@@ -119,6 +119,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
index da2feb7e04..2d5bd7f4d5 100644
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
@@ -32,13 +32,16 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(faceZoneToCell, 0);
+    addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, word);
+    addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, istream);
 
-defineTypeNameAndDebug(faceZoneToCell, 0);
-
-addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, word);
-
-addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, istream);
-
+    template<>
+    const char* Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>::names[] =
+    {
+        "master",
+        "slave"
+    };
 }
 
 
@@ -51,14 +54,6 @@ Foam::topoSetSource::addToUsageTable Foam::faceZoneToCell::usage_
 );
 
 
-template<>
-const char* Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>::names[] =
-{
-    "master",
-    "slave"
-};
-
-
 const Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>
     Foam::faceZoneToCell::faceActionNames_;
 
diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
index 7ee8b3d6da..132c46d60b 100644
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
@@ -116,6 +116,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
index a0a8922115..6a34e22208 100644
--- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
+++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
@@ -115,6 +115,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
index 8704f54367..16a8f72e00 100644
--- a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
+++ b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
@@ -100,6 +100,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
index 8a604f45bf..35d8a5525d 100644
--- a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
+++ b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
@@ -101,6 +101,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
index 8c3555b046..b61c8edd3a 100644
--- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
+++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
@@ -100,6 +100,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index 359f82fae3..ebb3a010b9 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -33,13 +33,15 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(pointToCell, 0);
+    addToRunTimeSelectionTable(topoSetSource, pointToCell, word);
+    addToRunTimeSelectionTable(topoSetSource, pointToCell, istream);
 
-defineTypeNameAndDebug(pointToCell, 0);
-
-addToRunTimeSelectionTable(topoSetSource, pointToCell, word);
-
-addToRunTimeSelectionTable(topoSetSource, pointToCell, istream);
-
+    template<>
+    const char* Foam::NamedEnum<Foam::pointToCell::pointAction, 1>::names[] =
+    {
+        "any"
+    };
 }
 
 
@@ -50,13 +52,6 @@ Foam::topoSetSource::addToUsageTable Foam::pointToCell::usage_
     "    Select all cells with any point in the pointSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::pointToCell::pointAction, 1>::names[] =
-{
-    "any"
-};
-
-
 const Foam::NamedEnum<Foam::pointToCell::pointAction, 1>
     Foam::pointToCell::pointActionNames_;
 
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
index 6e1a596a45..3c903a0b5c 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
@@ -115,6 +115,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
index 07ebb50255..bf4d9a3392 100644
--- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
+++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
@@ -105,6 +105,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet(const topoSetSource::setAction action, topoSet&)
          const;
 
diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
index 7fef878864..9119938a48 100644
--- a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
+++ b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
@@ -111,6 +111,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
index 3a7294cebd..8dffc55b1d 100644
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
@@ -109,6 +109,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
index 553e6a29d3..9f7de5539f 100644
--- a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
+++ b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
@@ -105,6 +105,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
index e91e04f1ae..48de11e0c5 100644
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
@@ -195,6 +195,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
index bb5504a177..edcb0fc391 100644
--- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
+++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
@@ -101,6 +101,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
index bbe2b656a1..22c37deafa 100644
--- a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
+++ b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
@@ -93,6 +93,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return CELLZONESOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
index 95afaa8ab0..fd36cd12a3 100644
--- a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
+++ b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
@@ -92,6 +92,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
index 63a5c93ad4..76db6b5fa5 100644
--- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
+++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
@@ -101,6 +101,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
index a7e5b8c285..2ff1769c8f 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
@@ -34,13 +34,16 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(cellToFace, 0);
+    addToRunTimeSelectionTable(topoSetSource, cellToFace, word);
+    addToRunTimeSelectionTable(topoSetSource, cellToFace, istream);
 
-defineTypeNameAndDebug(cellToFace, 0);
-
-addToRunTimeSelectionTable(topoSetSource, cellToFace, word);
-
-addToRunTimeSelectionTable(topoSetSource, cellToFace, istream);
-
+    template<>
+    const char* Foam::NamedEnum<Foam::cellToFace::cellAction, 2>::names[] =
+    {
+        "all",
+        "both"
+    };
 }
 
 
@@ -52,13 +55,6 @@ Foam::topoSetSource::addToUsageTable Foam::cellToFace::usage_
     "           -both: faces where both neighbours are in the cellSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::cellToFace::cellAction, 2>::names[] =
-{
-    "all",
-    "both"
-};
-
 const Foam::NamedEnum<Foam::cellToFace::cellAction, 2>
     Foam::cellToFace::cellActionNames_;
 
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
index 91302c3d7b..4a32c9f4be 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
@@ -120,6 +120,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
index 90bbc1d33a..cd12b07624 100644
--- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
+++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
@@ -93,6 +93,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
index 2434e39c9a..dd42f98a5a 100644
--- a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
+++ b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
@@ -100,6 +100,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
index 3c287a1b69..508c7c9a36 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
@@ -98,6 +98,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
index 12a1ff170b..dd407edb03 100644
--- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
+++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
@@ -101,6 +101,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index 51c7fb1351..8e272b86df 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -33,13 +33,16 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(pointToFace, 0);
+    addToRunTimeSelectionTable(topoSetSource, pointToFace, word);
+    addToRunTimeSelectionTable(topoSetSource, pointToFace, istream);
 
-defineTypeNameAndDebug(pointToFace, 0);
-
-addToRunTimeSelectionTable(topoSetSource, pointToFace, word);
-
-addToRunTimeSelectionTable(topoSetSource, pointToFace, istream);
-
+    template<>
+    const char* Foam::NamedEnum<Foam::pointToFace::pointAction, 2>::names[] =
+    {
+        "any",
+        "all"
+    };
 }
 
 
@@ -52,13 +55,6 @@ Foam::topoSetSource::addToUsageTable Foam::pointToFace::usage_
     "    -all points in the pointSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::pointToFace::pointAction, 2>::names[] =
-{
-    "any",
-    "all"
-};
-
 const Foam::NamedEnum<Foam::pointToFace::pointAction, 2>
     Foam::pointToFace::pointActionNames_;
 
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
index c8a2439e6a..6a6a090fa0 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
@@ -118,6 +118,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
index 9e04ef45a8..1496af2d5a 100644
--- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
+++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
@@ -101,6 +101,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
index 8cfcb5066f..1818e50827 100644
--- a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
@@ -93,6 +93,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACEZONESOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
index b062f440e5..ae120debb0 100644
--- a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
@@ -94,6 +94,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACEZONESOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
index f326ec0601..d1edb5417a 100644
--- a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
@@ -97,6 +97,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return FACEZONESOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
index b403d851e1..9d9c0eed37 100644
--- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
+++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
@@ -101,6 +101,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
index aaa74c8493..5026b51cfc 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
@@ -33,13 +33,15 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(cellToPoint, 0);
+    addToRunTimeSelectionTable(topoSetSource, cellToPoint, word);
+    addToRunTimeSelectionTable(topoSetSource, cellToPoint, istream);
 
-defineTypeNameAndDebug(cellToPoint, 0);
-
-addToRunTimeSelectionTable(topoSetSource, cellToPoint, word);
-
-addToRunTimeSelectionTable(topoSetSource, cellToPoint, istream);
-
+    template<>
+    const char* Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>::names[] =
+    {
+        "all"
+    };
 }
 
 
@@ -50,12 +52,6 @@ Foam::topoSetSource::addToUsageTable Foam::cellToPoint::usage_
     "    Select all points of cells in the cellSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>::names[] =
-{
-    "all"
-};
-
 const Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>
     Foam::cellToPoint::cellActionNames_;
 
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
index 6306ee5a0b..849bb70b8e 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
@@ -115,6 +115,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
index ff1161b820..4d0919f7c8 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
@@ -33,13 +33,15 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(faceToPoint, 0);
+    addToRunTimeSelectionTable(topoSetSource, faceToPoint, word);
+    addToRunTimeSelectionTable(topoSetSource, faceToPoint, istream);
 
-defineTypeNameAndDebug(faceToPoint, 0);
-
-addToRunTimeSelectionTable(topoSetSource, faceToPoint, word);
-
-addToRunTimeSelectionTable(topoSetSource, faceToPoint, istream);
-
+    template<>
+    const char* Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>::names[] =
+    {
+        "all"
+    };
 }
 
 
@@ -50,12 +52,6 @@ Foam::topoSetSource::addToUsageTable Foam::faceToPoint::usage_
     "    Select all points of faces in the faceSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>::names[] =
-{
-    "all"
-};
-
 const Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>
     Foam::faceToPoint::faceActionNames_;
 
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
index b8a966b07f..17488ba33f 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
@@ -115,6 +115,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
index 0b809b69ed..13b85be591 100644
--- a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
+++ b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
@@ -100,6 +100,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
index 5c746890b8..19d72cfeac 100644
--- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
+++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
@@ -100,6 +100,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
index b76332d784..3f890b3400 100644
--- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
+++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
@@ -93,6 +93,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
index 56e786fe61..0c4372c0dd 100644
--- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
+++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
@@ -123,6 +123,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
index 58ca2b2cf4..9fd4444552 100644
--- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
+++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
@@ -101,6 +101,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
index 5226f708ac..21d4f640b8 100644
--- a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
+++ b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
@@ -93,6 +93,11 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const
+        {
+            return POINTZONESOURCE;
+        }
+
         virtual void applyToSet
         (
             const topoSetSource::setAction action,
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C
index bb68be7e9c..f82cf59a90 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.C
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.C
@@ -34,24 +34,24 @@ namespace Foam
     defineTypeNameAndDebug(topoSetSource, 0);
     defineRunTimeSelectionTable(topoSetSource, word);
     defineRunTimeSelectionTable(topoSetSource, istream);
+
+    template<>
+    const char* Foam::NamedEnum<Foam::topoSetSource::setAction, 8>::names[] =
+    {
+        "clear",
+        "new",
+        "invert",
+        "add",
+        "delete",
+        "subset",
+        "list",
+        "remove"
+    };
 }
 
 
 Foam::HashTable<Foam::string>* Foam::topoSetSource::usageTablePtr_ = NULL;
 
-template<>
-const char* Foam::NamedEnum<Foam::topoSetSource::setAction, 8>::names[] =
-{
-    "clear",
-    "new",
-    "invert",
-    "add",
-    "delete",
-    "subset",
-    "list",
-    "remove"
-};
-
 
 const Foam::NamedEnum<Foam::topoSetSource::setAction, 8>
     Foam::topoSetSource::actionNames_;
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.H b/src/meshTools/sets/topoSetSource/topoSetSource.H
index 5bbe71eb74..81ca1cf38c 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.H
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.H
@@ -67,6 +67,18 @@ public:
 
     // Public data types
 
+        //- Enumeration defining the types of sources
+        enum sourceType
+        {
+            CELLSETSOURCE,
+            FACESETSOURCE,
+            POINTSETSOURCE,
+
+            CELLZONESOURCE,
+            FACEZONESOURCE,
+            POINTZONESOURCE
+        };
+
         //- Enumeration defining the valid actions
         enum setAction
         {
@@ -268,6 +280,8 @@ public:
 
     // Member Functions
 
+        virtual sourceType setType() const = 0;
+
         virtual void applyToSet(const setAction action, topoSet&) const = 0;
 
 };
diff --git a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
index 32f86c82c8..04338dc46b 100644
--- a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
@@ -148,7 +148,7 @@ Foam::labelList Foam::structuredDecomp::decompose
         patchData,
         faceData,
         cellData,
-        mesh.globalData().nTotalCells()
+        mesh.globalData().nTotalCells()+1
     );
 
     // And extract
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index 488f5ef3bb..f3fa4b92b5 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -3,7 +3,7 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
-    -I$(WM_THIRD_PARTY_DIR)/scotch_5.1/include \
+    -I$(WM_THIRD_PARTY_DIR)/scotch_5.1.10a/include \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude
 
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index 98f231cf48..ff262c5645 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
@@ -180,17 +180,31 @@ Foam::label Foam::ptscotchDecomp::decompose
 //            Info<< "Dumping Scotch graph file to " << str.name() << endl
 //                << "Use this in combination with gpart." << endl;
 //
-//            label version = 0;
+//            // Distributed graph file (.grf)
+//            label version = 2;
 //            str << version << nl;
-//            // Numer of vertices
-//            str << xadj.size()-1 << ' ' << adjncy.size() << nl;
+//            // Number of files
+
+//            // Number of files (procglbnbr)
+//            str << Pstream::nProcs();
+//            // My file number (procloc)
+//            str << ' ' << Pstream::myProcNo() << nl;
+//
+//            // Total number of vertices (vertglbnbr)
+//            str << returnReduce(mesh.nCells(), sumOp<label>());
+//            // Total number of connections (edgeglbnbr)
+//            str << ' ' << returnReduce(xadj[mesh.nCells()], sumOp<label>())
+//                << nl;
+//            // Local number of vertices (vertlocnbr)
+//            str << mesh.nCells();
+//            // Local number of connections (edgelocnbr)
+//            str << ' ' << xadj[mesh.nCells()] << nl;
 //            // Numbering starts from 0
 //            label baseval = 0;
-//            // Has weights?
-//            label hasEdgeWeights = 0;
-//            label hasVertexWeights = 0;
-//            label numericflag = 10*hasEdgeWeights+hasVertexWeights;
-//            str << baseval << ' ' << numericflag << nl;
+//            // Start of my global vertices (procdsptab[proclocnum])
+//            str << ' ' << globalCells.toGlobal(0);
+//            100*hasVertlabels+10*hasEdgeWeights+1*hasVertWeighs
+//            str << ' ' << "0" << nl;
 //            for (label cellI = 0; cellI < xadj.size()-1; cellI++)
 //            {
 //                label start = xadj[cellI];
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index 2f01188ac6..10374b63c3 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(WM_THIRD_PARTY_DIR)/scotch_5.1/include \
+    -I$(WM_THIRD_PARTY_DIR)/scotch_5.1.10a/include \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude
 
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 8e8f5ef800..aefab48016 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -49,18 +49,20 @@ namespace Foam
         distributedTriSurfaceMesh,
         dict
     );
+
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::distributedTriSurfaceMesh::distributionType,
+        3
+    >::names[] =
+    {
+        "follow",
+        "independent",
+        "frozen"
+    };
 }
 
-
-template<>
-const char*
-Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>::names[] =
-{
-    "follow",
-    "independent",
-    "frozen"
-};
-
 const Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>
     Foam::distributedTriSurfaceMesh::distributionTypeNames_;
 
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
index 591bc36229..ee3d6e4e8a 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
@@ -27,12 +27,16 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char* Foam::NamedEnum<Foam::fieldAverageItem::baseType, 2>::names[] =
+namespace Foam
 {
-    "iteration",
-    "time"
-};
+    template<>
+    const char* Foam::NamedEnum<Foam::fieldAverageItem::baseType, 2>::names[] =
+    {
+        "iteration",
+        "time"
+    };
+}
+
 
 const Foam::NamedEnum<Foam::fieldAverageItem::baseType, 2>
     Foam::fieldAverageItem::baseTypeNames_;
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
index eda5f7434f..c0f715e716 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -33,13 +33,15 @@ License
 
 defineTypeNameAndDebug(Foam::fieldMinMax, 0);
 
-
-template<>
-const char* Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>::names[] =
+namespace Foam
 {
-    "magnitude",
-    "component"
-};
+    template<>
+    const char* Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>::names[] =
+    {
+        "magnitude",
+        "component"
+    };
+}
 
 
 const Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>
diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
index 49ae674ef6..f26f558fb5 100644
--- a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
+++ b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
@@ -37,13 +37,21 @@ defineTypeNameAndDebug(Foam::abortCalculation, 0);
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char* Foam::NamedEnum<Foam::abortCalculation::actionType, 3>::names[] =
+namespace Foam
 {
-    "noWriteNow",
-    "writeNow",
-    "nextWrite"
-};
+    template<>
+    const char* Foam::NamedEnum
+    <
+       Foam::abortCalculation::actionType,
+       3
+    >::names[] =
+    {
+        "noWriteNow",
+        "writeNow",
+        "nextWrite"
+    };
+}
+
 
 const Foam::NamedEnum<Foam::abortCalculation::actionType, 3>
     Foam::abortCalculation::actionTypeNames_;
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index 22c352825b..6ca13f1da2 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -163,7 +163,7 @@ Foam::label Foam::probes::prepare()
 
             if (debug)
             {
-                Info<< "open  probe stream: " << sPtr->name() << endl;
+                Info<< "open probe stream: " << sPtr->name() << endl;
             }
 
             probeFilePtrs_.insert(fieldName, sPtr);
diff --git a/src/sampling/sampledSet/coordSet/coordSet.C b/src/sampling/sampledSet/coordSet/coordSet.C
index bc1237f310..24d6b4174c 100644
--- a/src/sampling/sampledSet/coordSet/coordSet.C
+++ b/src/sampling/sampledSet/coordSet/coordSet.C
@@ -27,15 +27,19 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-template<>
-const char* Foam::NamedEnum<Foam::coordSet::coordFormat, 5>::names[] =
+namespace Foam
 {
-    "xyz",
-    "x",
-    "y",
-    "z",
-    "distance"
-};
+    template<>
+    const char* Foam::NamedEnum<Foam::coordSet::coordFormat, 5>::names[] =
+    {
+        "xyz",
+        "x",
+        "y",
+        "z",
+        "distance"
+    };
+}
+
 
 const Foam::NamedEnum<Foam::coordSet::coordFormat, 5>
     Foam::coordSet::coordFormatNames_;
diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.C b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.C
index 54f4c08b92..09cbaa07ad 100644
--- a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.C
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.C
@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "basicMixture.H"
 #include "fvMesh.H"
 
@@ -39,11 +37,7 @@ defineTypeNameAndDebug(basicMixture, 0);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-basicMixture::basicMixture
-(
-    const dictionary&,
-    const fvMesh&
-)
+basicMixture::basicMixture(const dictionary&, const fvMesh&)
 {}
 
 
diff --git a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C
index 2f4139cbc1..c449db863c 100644
--- a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C
+++ b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C
@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "pureMixture.H"
 #include "fvMesh.H"
 
@@ -43,7 +41,7 @@ pureMixture<ThermoType>::pureMixture
 )
 :
     basicMixture(thermoDict, mesh),
-    mixture_(thermoDict.lookup("mixture"))
+    mixture_(thermoDict.subDict("mixture"))
 {}
 
 
@@ -59,7 +57,7 @@ pureMixture<ThermoType>::~pureMixture()
 template<class ThermoType>
 void pureMixture<ThermoType>::read(const dictionary& thermoDict)
 {
-    mixture_ = ThermoType(thermoDict.lookup("mixture"));
+    mixture_ = ThermoType(thermoDict.subDict("mixture"));
 }
 
 
diff --git a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
index 280abb8fee..ef59ef1b1b 100644
--- a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
@@ -114,7 +114,7 @@ Foam::ePsiThermo<MixtureType>::ePsiThermo(const fvMesh& mesh)
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionSet(0, 2, -2, 0, 0),
+        dimEnergy/dimMass,
         this->eBoundaryTypes()
     )
 {
@@ -245,7 +245,7 @@ Foam::tmp<Foam::volScalarField> Foam::ePsiThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
@@ -308,7 +308,7 @@ Foam::tmp<Foam::volScalarField> Foam::ePsiThermo<MixtureType>::Cv() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
diff --git a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
index d867ea862f..b6e053e734 100644
--- a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
@@ -112,7 +112,7 @@ Foam::hPsiThermo<MixtureType>::hPsiThermo(const fvMesh& mesh)
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionSet(0, 2, -2, 0, 0),
+        dimEnergy/dimMass,
         this->hBoundaryTypes()
     )
 {
@@ -243,7 +243,7 @@ Foam::tmp<Foam::volScalarField> Foam::hPsiThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
@@ -306,7 +306,7 @@ Foam::tmp<Foam::volScalarField> Foam::hPsiThermo<MixtureType>::Cv() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
diff --git a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
index 6ba938d1fe..8774f3a7b8 100644
--- a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
@@ -243,7 +243,7 @@ Foam::tmp<Foam::volScalarField> Foam::hsPsiThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
diff --git a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
index 1e43d467eb..fc4d349da0 100644
--- a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
@@ -117,7 +117,7 @@ Foam::hRhoThermo<MixtureType>::hRhoThermo(const fvMesh& mesh)
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionSet(0, 2, -2, 0, 0),
+        dimEnergy/dimMass,
         this->hBoundaryTypes()
     )
 {
@@ -242,7 +242,7 @@ Foam::tmp<Foam::volScalarField> Foam::hRhoThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
@@ -305,7 +305,7 @@ Foam::tmp<Foam::volScalarField> Foam::hRhoThermo<MixtureType>::Cv() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
index 4b62582519..ddd2750668 100644
--- a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
@@ -46,7 +46,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                            Class basicSolidThermo Declaration
+                       Class basicSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicSolidThermo
@@ -69,8 +69,7 @@ public:
     TypeName("basicSolidThermo");
 
 
-    // Declare run-time constructor selection tables
-
+    //- Declare run-time constructor selection tables
     declareRunTimeSelectionTable
     (
         autoPtr,
@@ -91,9 +90,8 @@ public:
         static autoPtr<basicSolidThermo> New(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~basicSolidThermo();
+    //- Destructor
+    virtual ~basicSolidThermo();
 
 
     // Member Functions
@@ -149,6 +147,7 @@ public:
                 //- Emissivity []
                 virtual tmp<scalarField> emissivity(const label) const = 0;
 
+
 //        // Point wise properties
 //
 //            //- Density [kg/m3]
@@ -166,6 +165,7 @@ public:
 //            //- Emissivity []
 //            virtual scalar emissivity(const scalar T) const = 0;
 
+
         // I-O
 
             //- Write the basicSolidThermo properties
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.C
index e7caf0d847..e81e44bca2 100644
--- a/src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.C
@@ -228,8 +228,6 @@ Foam::directionalSolidThermo::directionalSolidThermo(const fvMesh& mesh)
         }
     }
 
-
-
     correct();
 }
 
@@ -269,7 +267,7 @@ Foam::symmTensor Foam::directionalSolidThermo::transformPrincipal
         tt.yx()*st.x()*tt.zx()
       + tt.yy()*st.y()*tt.zy()
       + tt.yz()*st.z()*tt.zz(),
-        
+
         tt.zx()*st.x()*tt.zx()
       + tt.zy()*st.y()*tt.zy()
       + tt.zz()*st.z()*tt.zz()
@@ -419,9 +417,9 @@ Foam::tmp<Foam::volScalarField> Foam::directionalSolidThermo::K() const
         const vector& v = KValues_[i];
         if
         (
-            v.x() != v.y() 
-         || v.x() != v.z() 
-         || v.y() != v.z() 
+            v.x() != v.y()
+         || v.x() != v.z()
+         || v.y() != v.z()
         )
         {
             FatalErrorIn("directionalSolidThermo::K() const")
@@ -597,9 +595,9 @@ Foam::tmp<Foam::scalarField> Foam::directionalSolidThermo::K
         const vector& v = KValues_[i];
         if
         (
-            v.x() != v.y() 
-         || v.x() != v.z() 
-         || v.y() != v.z() 
+            v.x() != v.y()
+         || v.x() != v.z()
+         || v.y() != v.z()
         )
         {
             FatalErrorIn("directionalSolidThermo::K() const")
@@ -634,7 +632,7 @@ Foam::tmp<Foam::symmTensorField> Foam::directionalSolidThermo::directionalK
 
     tmp<symmTensorField> tglobalK(new symmTensorField(localK.size()));
     transformField(tglobalK(), ccTransforms_.boundaryField()[patchI], localK);
-    
+
     return tglobalK;
 }
 
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
index d46e3e110a..8c958caa4f 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
@@ -57,11 +57,7 @@ Foam::liquidMixture::liquidMixture
 
     forAll(components_, i)
     {
-        properties_.set
-        (
-            i,
-            liquid::New(props.lookup(components_[i]))
-        );
+        properties_.set(i, liquid::New(props.subDict(components_[i])));
     }
 }
 
@@ -79,12 +75,8 @@ Foam::autoPtr<Foam::liquidMixture> Foam::liquidMixture::New
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::liquidMixture::Tc
-(
-    const scalarField& x
-) const
+Foam::scalar Foam::liquidMixture::Tc(const scalarField& x) const
 {
-
     scalar vTc = 0.0;
     scalar vc = 0.0;
 
@@ -99,10 +91,7 @@ Foam::scalar Foam::liquidMixture::Tc
 }
 
 
-Foam::scalar Foam::liquidMixture::Tpc
-(
-    const scalarField& x
-) const
+Foam::scalar Foam::liquidMixture::Tpc(const scalarField& x) const
 {
     scalar Tpc = 0.0;
     forAll(properties_, i)
@@ -114,10 +103,7 @@ Foam::scalar Foam::liquidMixture::Tpc
 }
 
 
-Foam::scalar Foam::liquidMixture::Ppc
-(
-    const scalarField& x
-) const
+Foam::scalar Foam::liquidMixture::Ppc(const scalarField& x) const
 {
     scalar Vc = 0.0;
     scalar Zc = 0.0;
@@ -131,10 +117,7 @@ Foam::scalar Foam::liquidMixture::Ppc
 }
 
 
-Foam::scalar Foam::liquidMixture::omega
-(
-    const scalarField& x
-) const
+Foam::scalar Foam::liquidMixture::omega(const scalarField& x) const
 {
     scalar omega = 0.0;
     forAll(properties_, i)
@@ -167,10 +150,7 @@ Foam::scalarField Foam::liquidMixture::Xs
 }
 
 
-Foam::scalar Foam::liquidMixture::W
-(
-    const scalarField& x
-) const
+Foam::scalar Foam::liquidMixture::W(const scalarField& x) const
 {
     scalar W = 0.0;
     forAll(properties_, i)
@@ -182,10 +162,7 @@ Foam::scalar Foam::liquidMixture::W
 }
 
 
-Foam::scalarField Foam::liquidMixture::Y
-(
-    const scalarField& X
-) const
+Foam::scalarField Foam::liquidMixture::Y(const scalarField& X) const
 {
     scalarField Y(X/W(X));
 
@@ -198,10 +175,7 @@ Foam::scalarField Foam::liquidMixture::Y
 }
 
 
-Foam::scalarField Foam::liquidMixture::X
-(
-    const scalarField& Y
-) const
+Foam::scalarField Foam::liquidMixture::X(const scalarField& Y) const
 {
     scalarField X(Y.size());
     scalar Winv = 0.0;
diff --git a/src/thermophysicalModels/liquids/Ar/Ar.C b/src/thermophysicalModels/liquids/Ar/Ar.C
index 63faeb6fd7..456872eeaa 100644
--- a/src/thermophysicalModels/liquids/Ar/Ar.C
+++ b/src/thermophysicalModels/liquids/Ar/Ar.C
@@ -33,9 +33,9 @@ namespace Foam
     defineTypeNameAndDebug(Ar, 0);
     addToRunTimeSelectionTable(liquid, Ar,);
     addToRunTimeSelectionTable(liquid, Ar, Istream);
+    addToRunTimeSelectionTable(liquid, Ar, dictionary);
 }
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::Ar::Ar()
@@ -139,4 +139,23 @@ Foam::Ar::Ar(Istream& is)
 {}
 
 
+Foam::Ar::Ar(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/Ar/Ar.H b/src/thermophysicalModels/liquids/Ar/Ar.H
index 2459f39524..7c09009841 100644
--- a/src/thermophysicalModels/liquids/Ar/Ar.H
+++ b/src/thermophysicalModels/liquids/Ar/Ar.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         Ar(Istream& is);
 
+        //- Construct from dictionary
+        Ar(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.C b/src/thermophysicalModels/liquids/C10H22/C10H22.C
index b1a8c74415..8c1e70e388 100644
--- a/src/thermophysicalModels/liquids/C10H22/C10H22.C
+++ b/src/thermophysicalModels/liquids/C10H22/C10H22.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C10H22, 0);
     addToRunTimeSelectionTable(liquid, C10H22,);
     addToRunTimeSelectionTable(liquid, C10H22, Istream);
+    addToRunTimeSelectionTable(liquid, C10H22, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C10H22::C10H22(Istream& is)
 {}
 
 
+Foam::C10H22::C10H22(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.H b/src/thermophysicalModels/liquids/C10H22/C10H22.H
index edec8b851d..0e6881d58c 100644
--- a/src/thermophysicalModels/liquids/C10H22/C10H22.H
+++ b/src/thermophysicalModels/liquids/C10H22/C10H22.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C10H22(Istream& is);
 
+        //- Construct from dictionary
+        C10H22(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.C b/src/thermophysicalModels/liquids/C12H26/C12H26.C
index 33dc38baa9..52efdd1ed2 100644
--- a/src/thermophysicalModels/liquids/C12H26/C12H26.C
+++ b/src/thermophysicalModels/liquids/C12H26/C12H26.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C12H26, 0);
     addToRunTimeSelectionTable(liquid, C12H26,);
     addToRunTimeSelectionTable(liquid, C12H26, Istream);
+    addToRunTimeSelectionTable(liquid, C12H26, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -138,4 +139,23 @@ Foam::C12H26::C12H26(Istream& is)
 {}
 
 
+Foam::C12H26::C12H26(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.H b/src/thermophysicalModels/liquids/C12H26/C12H26.H
index 74af5b0d0c..cd0070c79f 100644
--- a/src/thermophysicalModels/liquids/C12H26/C12H26.H
+++ b/src/thermophysicalModels/liquids/C12H26/C12H26.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C12H26(Istream& is);
 
+        //- Construct from dictionary
+        C12H26(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.C b/src/thermophysicalModels/liquids/C13H28/C13H28.C
index 6788dc257a..f47acd37f3 100644
--- a/src/thermophysicalModels/liquids/C13H28/C13H28.C
+++ b/src/thermophysicalModels/liquids/C13H28/C13H28.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C13H28, 0);
     addToRunTimeSelectionTable(liquid, C13H28,);
     addToRunTimeSelectionTable(liquid, C13H28, Istream);
+    addToRunTimeSelectionTable(liquid, C13H28, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C13H28::C13H28(Istream& is)
 {}
 
 
+Foam::C13H28::C13H28(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.H b/src/thermophysicalModels/liquids/C13H28/C13H28.H
index c9c1687fd6..7e481470a5 100644
--- a/src/thermophysicalModels/liquids/C13H28/C13H28.H
+++ b/src/thermophysicalModels/liquids/C13H28/C13H28.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C13H28(Istream& is);
 
+        //- Construct from dictionary
+        C13H28(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.C b/src/thermophysicalModels/liquids/C14H30/C14H30.C
index e4366245f8..9c7dfc16bf 100644
--- a/src/thermophysicalModels/liquids/C14H30/C14H30.C
+++ b/src/thermophysicalModels/liquids/C14H30/C14H30.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C14H30, 0);
     addToRunTimeSelectionTable(liquid, C14H30,);
     addToRunTimeSelectionTable(liquid, C14H30, Istream);
+    addToRunTimeSelectionTable(liquid, C14H30, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C14H30::C14H30(Istream& is)
 {}
 
 
+Foam::C14H30::C14H30(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.H b/src/thermophysicalModels/liquids/C14H30/C14H30.H
index ac6542120d..c7095f77e6 100644
--- a/src/thermophysicalModels/liquids/C14H30/C14H30.H
+++ b/src/thermophysicalModels/liquids/C14H30/C14H30.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C14H30(Istream& is);
 
+        //- Construct from dictionary
+        C14H30(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.C b/src/thermophysicalModels/liquids/C16H34/C16H34.C
index 5f14b2fa85..98f18bff4d 100644
--- a/src/thermophysicalModels/liquids/C16H34/C16H34.C
+++ b/src/thermophysicalModels/liquids/C16H34/C16H34.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C16H34, 0);
     addToRunTimeSelectionTable(liquid, C16H34,);
     addToRunTimeSelectionTable(liquid, C16H34, Istream);
+    addToRunTimeSelectionTable(liquid, C16H34, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C16H34::C16H34(Istream& is)
 {}
 
 
+Foam::C16H34::C16H34(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.H b/src/thermophysicalModels/liquids/C16H34/C16H34.H
index e13e5abb0c..1b70c2e7a9 100644
--- a/src/thermophysicalModels/liquids/C16H34/C16H34.H
+++ b/src/thermophysicalModels/liquids/C16H34/C16H34.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C16H34(Istream& is);
 
+        //- Construct from dictionary
+        C16H34(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
index 9f0db10489..afe17a2c76 100644
--- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
+++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C2H5OH, 0);
     addToRunTimeSelectionTable(liquid, C2H5OH,);
     addToRunTimeSelectionTable(liquid, C2H5OH, Istream);
+    addToRunTimeSelectionTable(liquid, C2H5OH, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C2H5OH::C2H5OH(Istream& is)
 {}
 
 
+Foam::C2H5OH::C2H5OH(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
index 9926cf454e..5027e925ef 100644
--- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
+++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C2H5OH(Istream& is);
 
+        //- Construct from dictionary
+        C2H5OH(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.C b/src/thermophysicalModels/liquids/C2H6/C2H6.C
index f66b1b3ed3..871c75881e 100644
--- a/src/thermophysicalModels/liquids/C2H6/C2H6.C
+++ b/src/thermophysicalModels/liquids/C2H6/C2H6.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C2H6, 0);
     addToRunTimeSelectionTable(liquid, C2H6,);
     addToRunTimeSelectionTable(liquid, C2H6, Istream);
+    addToRunTimeSelectionTable(liquid, C2H6, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -137,4 +138,23 @@ Foam::C2H6::C2H6(Istream& is)
 {}
 
 
+Foam::C2H6::C2H6(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.H b/src/thermophysicalModels/liquids/C2H6/C2H6.H
index 53ac57dc4f..6be77e42c2 100644
--- a/src/thermophysicalModels/liquids/C2H6/C2H6.H
+++ b/src/thermophysicalModels/liquids/C2H6/C2H6.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C2H6(Istream& is);
 
+        //- Construct from dictionary
+        C2H6(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C b/src/thermophysicalModels/liquids/C2H6O/C2H6O.C
index 723e7201dc..89fc93f75a 100644
--- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C
+++ b/src/thermophysicalModels/liquids/C2H6O/C2H6O.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C2H6O, 0);
     addToRunTimeSelectionTable(liquid, C2H6O,);
     addToRunTimeSelectionTable(liquid, C2H6O, Istream);
+    addToRunTimeSelectionTable(liquid, C2H6O, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C2H6O::C2H6O(Istream& is)
 {}
 
 
+Foam::C2H6O::C2H6O(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H b/src/thermophysicalModels/liquids/C2H6O/C2H6O.H
index f93a63a64e..a9a053b371 100644
--- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H
+++ b/src/thermophysicalModels/liquids/C2H6O/C2H6O.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C2H6O(Istream& is);
 
+        //- Construct from dictionary
+        C2H6O(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C b/src/thermophysicalModels/liquids/C3H6O/C3H6O.C
index 6bc22d1ec2..fa20f6d078 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C
+++ b/src/thermophysicalModels/liquids/C3H6O/C3H6O.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C3H6O, 0);
     addToRunTimeSelectionTable(liquid, C3H6O,);
     addToRunTimeSelectionTable(liquid, C3H6O, Istream);
+    addToRunTimeSelectionTable(liquid, C3H6O, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C3H6O::C3H6O(Istream& is)
 {}
 
 
+Foam::C3H6O::C3H6O(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H b/src/thermophysicalModels/liquids/C3H6O/C3H6O.H
index 8a7c1049f6..b383111750 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H
+++ b/src/thermophysicalModels/liquids/C3H6O/C3H6O.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C3H6O(Istream& is);
 
+        //- Construct from dictionary
+        C3H6O(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.C b/src/thermophysicalModels/liquids/C3H8/C3H8.C
index 436d4e7928..767e83c834 100644
--- a/src/thermophysicalModels/liquids/C3H8/C3H8.C
+++ b/src/thermophysicalModels/liquids/C3H8/C3H8.C
@@ -33,7 +33,9 @@ namespace Foam
     defineTypeNameAndDebug(C3H8, 0);
     addToRunTimeSelectionTable(liquid, C3H8,);
     addToRunTimeSelectionTable(liquid, C3H8, Istream);
+    addToRunTimeSelectionTable(liquid, C3H8, dictionary);
 }
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::C3H8::C3H8()
@@ -135,4 +137,23 @@ Foam::C3H8::C3H8(Istream& is)
 {}
 
 
+Foam::C3H8::C3H8(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.H b/src/thermophysicalModels/liquids/C3H8/C3H8.H
index c97a9b87f2..c9cea66934 100644
--- a/src/thermophysicalModels/liquids/C3H8/C3H8.H
+++ b/src/thermophysicalModels/liquids/C3H8/C3H8.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C3H8(Istream& is);
 
+        //- Construct from dictionary
+        C3H8(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C b/src/thermophysicalModels/liquids/C4H10O/C4H10O.C
index f6d8c8f083..1dd51ea3f6 100644
--- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C
+++ b/src/thermophysicalModels/liquids/C4H10O/C4H10O.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C4H10O, 0);
     addToRunTimeSelectionTable(liquid, C4H10O,);
     addToRunTimeSelectionTable(liquid, C4H10O, Istream);
+    addToRunTimeSelectionTable(liquid, C4H10O, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C4H10O::C4H10O(Istream& is)
 {}
 
 
+Foam::C4H10O::C4H10O(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H b/src/thermophysicalModels/liquids/C4H10O/C4H10O.H
index 64b8940575..a2d07a66a1 100644
--- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H
+++ b/src/thermophysicalModels/liquids/C4H10O/C4H10O.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C4H10O(Istream& is);
 
+        //- Construct from dictionary
+        C4H10O(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.C b/src/thermophysicalModels/liquids/C6H14/C6H14.C
index 869c7eace0..0a3a75349a 100644
--- a/src/thermophysicalModels/liquids/C6H14/C6H14.C
+++ b/src/thermophysicalModels/liquids/C6H14/C6H14.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C6H14, 0);
     addToRunTimeSelectionTable(liquid, C6H14,);
     addToRunTimeSelectionTable(liquid, C6H14, Istream);
+    addToRunTimeSelectionTable(liquid, C6H14, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C6H14::C6H14(Istream& is)
 {}
 
 
+Foam::C6H14::C6H14(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.H b/src/thermophysicalModels/liquids/C6H14/C6H14.H
index 3c515d8e48..9a29cb9590 100644
--- a/src/thermophysicalModels/liquids/C6H14/C6H14.H
+++ b/src/thermophysicalModels/liquids/C6H14/C6H14.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C6H14(Istream& is);
 
+        //- Construct from dictionary
+        C6H14(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.C b/src/thermophysicalModels/liquids/C6H6/C6H6.C
index ae06dc9a6d..f3d2beb400 100644
--- a/src/thermophysicalModels/liquids/C6H6/C6H6.C
+++ b/src/thermophysicalModels/liquids/C6H6/C6H6.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C6H6, 0);
     addToRunTimeSelectionTable(liquid, C6H6,);
     addToRunTimeSelectionTable(liquid, C6H6, Istream);
+    addToRunTimeSelectionTable(liquid, C6H6, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C6H6::C6H6(Istream& is)
 {}
 
 
+Foam::C6H6::C6H6(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.H b/src/thermophysicalModels/liquids/C6H6/C6H6.H
index 6d9811ae03..0ac6610758 100644
--- a/src/thermophysicalModels/liquids/C6H6/C6H6.H
+++ b/src/thermophysicalModels/liquids/C6H6/C6H6.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C6H6(Istream& is);
 
+        //- Construct from dictionary
+        C6H6(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.C b/src/thermophysicalModels/liquids/C7H16/C7H16.C
index 27bac6ac1e..df1d14bbe6 100644
--- a/src/thermophysicalModels/liquids/C7H16/C7H16.C
+++ b/src/thermophysicalModels/liquids/C7H16/C7H16.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C7H16, 0);
     addToRunTimeSelectionTable(liquid, C7H16,);
     addToRunTimeSelectionTable(liquid, C7H16, Istream);
+    addToRunTimeSelectionTable(liquid, C7H16, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -145,4 +146,23 @@ Foam::C7H16::C7H16(Istream& is)
 {}
 
 
+Foam::C7H16::C7H16(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.H b/src/thermophysicalModels/liquids/C7H16/C7H16.H
index ebd03b5fec..75f816ff44 100644
--- a/src/thermophysicalModels/liquids/C7H16/C7H16.H
+++ b/src/thermophysicalModels/liquids/C7H16/C7H16.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C7H16(Istream& is);
 
+        //- Construct from dictionary
+        C7H16(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.C b/src/thermophysicalModels/liquids/C7H8/C7H8.C
index 5029ee8988..e38dede79d 100644
--- a/src/thermophysicalModels/liquids/C7H8/C7H8.C
+++ b/src/thermophysicalModels/liquids/C7H8/C7H8.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C7H8, 0);
     addToRunTimeSelectionTable(liquid, C7H8,);
     addToRunTimeSelectionTable(liquid, C7H8, Istream);
+    addToRunTimeSelectionTable(liquid, C7H8, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C7H8::C7H8(Istream& is)
 {}
 
 
+Foam::C7H8::C7H8(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.H b/src/thermophysicalModels/liquids/C7H8/C7H8.H
index 8046b872c2..2091f852c9 100644
--- a/src/thermophysicalModels/liquids/C7H8/C7H8.H
+++ b/src/thermophysicalModels/liquids/C7H8/C7H8.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C7H8(Istream& is);
 
+        //- Construct from dictionary
+        C7H8(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.C b/src/thermophysicalModels/liquids/C8H10/C8H10.C
index 625d29b3cf..5c6e34c12c 100644
--- a/src/thermophysicalModels/liquids/C8H10/C8H10.C
+++ b/src/thermophysicalModels/liquids/C8H10/C8H10.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C8H10, 0);
     addToRunTimeSelectionTable(liquid, C8H10,);
     addToRunTimeSelectionTable(liquid, C8H10, Istream);
+    addToRunTimeSelectionTable(liquid, C8H10, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C8H10::C8H10(Istream& is)
 {}
 
 
+Foam::C8H10::C8H10(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.H b/src/thermophysicalModels/liquids/C8H10/C8H10.H
index db139b0589..a524ad0138 100644
--- a/src/thermophysicalModels/liquids/C8H10/C8H10.H
+++ b/src/thermophysicalModels/liquids/C8H10/C8H10.H
@@ -109,6 +109,9 @@ public:
         //- Construct from Istream
         C8H10(Istream& is);
 
+        //- Construct from dictionary
+        C8H10(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.C b/src/thermophysicalModels/liquids/C8H18/C8H18.C
index f7844df53d..ce8d75361e 100644
--- a/src/thermophysicalModels/liquids/C8H18/C8H18.C
+++ b/src/thermophysicalModels/liquids/C8H18/C8H18.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C8H18, 0);
     addToRunTimeSelectionTable(liquid, C8H18,);
     addToRunTimeSelectionTable(liquid, C8H18, Istream);
+    addToRunTimeSelectionTable(liquid, C8H18, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C8H18::C8H18(Istream& is)
 {}
 
 
+Foam::C8H18::C8H18(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.H b/src/thermophysicalModels/liquids/C8H18/C8H18.H
index 286cd409f6..7ccc527680 100644
--- a/src/thermophysicalModels/liquids/C8H18/C8H18.H
+++ b/src/thermophysicalModels/liquids/C8H18/C8H18.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C8H18(Istream& is);
 
+        //- Construct from dictionary
+        C8H18(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.C b/src/thermophysicalModels/liquids/C9H20/C9H20.C
index 8f4bd94b25..674dc80ed3 100644
--- a/src/thermophysicalModels/liquids/C9H20/C9H20.C
+++ b/src/thermophysicalModels/liquids/C9H20/C9H20.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C9H20, 0);
     addToRunTimeSelectionTable(liquid, C9H20,);
     addToRunTimeSelectionTable(liquid, C9H20, Istream);
+    addToRunTimeSelectionTable(liquid, C9H20, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C9H20::C9H20(Istream& is)
 {}
 
 
+Foam::C9H20::C9H20(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.H b/src/thermophysicalModels/liquids/C9H20/C9H20.H
index 3d71b0efc4..f930dcf21c 100644
--- a/src/thermophysicalModels/liquids/C9H20/C9H20.H
+++ b/src/thermophysicalModels/liquids/C9H20/C9H20.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C9H20(Istream& is);
 
+        //- Construct from dictionary
+        C9H20(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C b/src/thermophysicalModels/liquids/CH3OH/CH3OH.C
index 89ce2ac94f..ef18d40a20 100644
--- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C
+++ b/src/thermophysicalModels/liquids/CH3OH/CH3OH.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(CH3OH, 0);
     addToRunTimeSelectionTable(liquid, CH3OH,);
     addToRunTimeSelectionTable(liquid, CH3OH, Istream);
+    addToRunTimeSelectionTable(liquid, CH3OH, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::CH3OH::CH3OH(Istream& is)
 {}
 
 
+Foam::CH3OH::CH3OH(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H b/src/thermophysicalModels/liquids/CH3OH/CH3OH.H
index b33e26dc7c..c754565d9c 100644
--- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H
+++ b/src/thermophysicalModels/liquids/CH3OH/CH3OH.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         CH3OH(Istream& is);
 
+        //- Construct from dictionary
+        CH3OH(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
index 23ef4fa369..7b36eb583b 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
@@ -34,6 +34,7 @@ namespace Foam
     defineTypeNameAndDebug(CH4N2O, 0);
     addToRunTimeSelectionTable(liquid, CH4N2O,);
     addToRunTimeSelectionTable(liquid, CH4N2O, Istream);
+    addToRunTimeSelectionTable(liquid, CH4N2O, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -131,4 +132,23 @@ Foam::CH4N2O::CH4N2O(Istream& is)
 {}
 
 
+Foam::CH4N2O::CH4N2O(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
index a683cab080..a45bc0cd5b 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         CH4N2O(Istream& is);
 
+        //- Construct from dictionary
+        CH4N2O(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/H2O/H2O.C b/src/thermophysicalModels/liquids/H2O/H2O.C
index 1df2d3cc41..ff68fa7324 100644
--- a/src/thermophysicalModels/liquids/H2O/H2O.C
+++ b/src/thermophysicalModels/liquids/H2O/H2O.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(H2O, 0);
     addToRunTimeSelectionTable(liquid, H2O,);
     addToRunTimeSelectionTable(liquid, H2O, Istream);
+    addToRunTimeSelectionTable(liquid, H2O, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -153,4 +154,23 @@ Foam::H2O::H2O(Istream& is)
 {}
 
 
+Foam::H2O::H2O(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/H2O/H2O.H b/src/thermophysicalModels/liquids/H2O/H2O.H
index fcf8768a46..08e4145a9b 100644
--- a/src/thermophysicalModels/liquids/H2O/H2O.H
+++ b/src/thermophysicalModels/liquids/H2O/H2O.H
@@ -109,6 +109,9 @@ public:
         //- Construct from Istream
         H2O(Istream& is);
 
+        //- Construct from dictionary
+        H2O(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C b/src/thermophysicalModels/liquids/IC8H18/IC8H18.C
index e21713598c..dd03caf74e 100644
--- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C
+++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(IC8H18, 0);
     addToRunTimeSelectionTable(liquid, IC8H18,);
     addToRunTimeSelectionTable(liquid, IC8H18, Istream);
+    addToRunTimeSelectionTable(liquid, IC8H18, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::IC8H18::IC8H18(Istream& is)
 {}
 
 
+Foam::IC8H18::IC8H18(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H b/src/thermophysicalModels/liquids/IC8H18/IC8H18.H
index f446e056df..6a90aa0dae 100644
--- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H
+++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         IC8H18(Istream& is);
 
+        //- Construct from dictionary
+        IC8H18(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.C b/src/thermophysicalModels/liquids/IDEA/IDEA.C
index 6e05117d05..959f8f3aea 100644
--- a/src/thermophysicalModels/liquids/IDEA/IDEA.C
+++ b/src/thermophysicalModels/liquids/IDEA/IDEA.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(IDEA, 0);
     addToRunTimeSelectionTable(liquid, IDEA,);
     addToRunTimeSelectionTable(liquid, IDEA, Istream);
+    addToRunTimeSelectionTable(liquid, IDEA, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -166,4 +167,23 @@ Foam::IDEA::IDEA(Istream& is)
 {}
 
 
+Foam::IDEA::IDEA(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.H b/src/thermophysicalModels/liquids/IDEA/IDEA.H
index 755018343c..41bfb4b326 100644
--- a/src/thermophysicalModels/liquids/IDEA/IDEA.H
+++ b/src/thermophysicalModels/liquids/IDEA/IDEA.H
@@ -132,6 +132,9 @@ public:
         //- Construct from Istream
         IDEA(Istream& is);
 
+        //- Construct from dictionary
+        IDEA(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/MB/MB.C b/src/thermophysicalModels/liquids/MB/MB.C
index 95c70866f4..fe9c3fb574 100644
--- a/src/thermophysicalModels/liquids/MB/MB.C
+++ b/src/thermophysicalModels/liquids/MB/MB.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(MB, 0);
     addToRunTimeSelectionTable(liquid, MB,);
     addToRunTimeSelectionTable(liquid, MB, Istream);
+    addToRunTimeSelectionTable(liquid, MB, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -130,4 +131,23 @@ Foam::MB::MB(Istream& is)
 {}
 
 
+Foam::MB::MB(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/MB/MB.H b/src/thermophysicalModels/liquids/MB/MB.H
index 03a950f4a8..121a914154 100644
--- a/src/thermophysicalModels/liquids/MB/MB.H
+++ b/src/thermophysicalModels/liquids/MB/MB.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         MB(Istream& is);
 
+        //- Construct from dictionary
+        MB(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/N2/N2.C b/src/thermophysicalModels/liquids/N2/N2.C
index 2f3cb19939..918ff702a6 100644
--- a/src/thermophysicalModels/liquids/N2/N2.C
+++ b/src/thermophysicalModels/liquids/N2/N2.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(N2, 0);
     addToRunTimeSelectionTable(liquid, N2,);
     addToRunTimeSelectionTable(liquid, N2, Istream);
+    addToRunTimeSelectionTable(liquid, N2, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::N2::N2(Istream& is)
 {}
 
 
+Foam::N2::N2(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/N2/N2.H b/src/thermophysicalModels/liquids/N2/N2.H
index 3aeaea6c0b..66a4d84434 100644
--- a/src/thermophysicalModels/liquids/N2/N2.H
+++ b/src/thermophysicalModels/liquids/N2/N2.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         N2(Istream& is);
 
+        //- Construct from dictionary
+        N2(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
index 9ad968dc5f..5d04492def 100644
--- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
+++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(aC10H7CH3, 0);
     addToRunTimeSelectionTable(liquid, aC10H7CH3,);
     addToRunTimeSelectionTable(liquid, aC10H7CH3, Istream);
+    addToRunTimeSelectionTable(liquid, aC10H7CH3, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -138,4 +139,23 @@ Foam::aC10H7CH3::aC10H7CH3(Istream& is)
 {}
 
 
+Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
index 82c546003b..702f07faec 100644
--- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
+++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         aC10H7CH3(Istream& is);
 
+        //- Construct from dictionary
+        aC10H7CH3(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
index fae5820744..540f3d249e 100644
--- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
+++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(bC10H7CH3, 0);
     addToRunTimeSelectionTable(liquid, bC10H7CH3,);
     addToRunTimeSelectionTable(liquid, bC10H7CH3, Istream);
+    addToRunTimeSelectionTable(liquid, bC10H7CH3, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -138,4 +139,23 @@ Foam::bC10H7CH3::bC10H7CH3(Istream& is)
 {}
 
 
+Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
index 3b6f6a5db4..a986564046 100644
--- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
+++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         bC10H7CH3(Istream& is);
 
+        //- Construct from dictionary
+        bC10H7CH3(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
index f1c6885d6b..fc89e36a5e 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(iC3H8O, 0);
     addToRunTimeSelectionTable(liquid, iC3H8O,);
     addToRunTimeSelectionTable(liquid, iC3H8O, Istream);
+    addToRunTimeSelectionTable(liquid, iC3H8O, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::iC3H8O::iC3H8O(Istream& is)
 {}
 
 
+Foam::iC3H8O::iC3H8O(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
index 4cd1d692cf..4b2e45cd74 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
@@ -108,6 +108,9 @@ public:
         //- Construct from Istream
         iC3H8O(Istream& is);
 
+        //- Construct from dictionary
+        iC3H8O(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/liquids/liquid/liquid.C b/src/thermophysicalModels/liquids/liquid/liquid.C
index 3b6b0b2e03..cb3f322182 100644
--- a/src/thermophysicalModels/liquids/liquid/liquid.C
+++ b/src/thermophysicalModels/liquids/liquid/liquid.C
@@ -23,10 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "liquid.H"
 #include "HashTable.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -35,10 +34,66 @@ namespace Foam
     defineTypeNameAndDebug(liquid, 0);
     defineRunTimeSelectionTable(liquid,);
     defineRunTimeSelectionTable(liquid, Istream);
+    defineRunTimeSelectionTable(liquid, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+Foam::liquid::liquid
+(
+    scalar W,
+    scalar Tc,
+    scalar Pc,
+    scalar Vc,
+    scalar Zc,
+    scalar Tt,
+    scalar Pt,
+    scalar Tb,
+    scalar dipm,
+    scalar omega,
+    scalar delta
+)
+:
+    W_(W),
+    Tc_(Tc),
+    Pc_(Pc),
+    Vc_(Vc),
+    Zc_(Zc),
+    Tt_(Tt),
+    Pt_(Pt),
+    Tb_(Tb),
+    dipm_(dipm),
+    omega_(omega),
+    delta_(delta)
+{}
+
+
+Foam::liquid::liquid(Istream& is)
+:
+    W_(readScalar(is)),
+    Tc_(readScalar(is)),
+    Pc_(readScalar(is)),
+    Vc_(readScalar(is)),
+    dipm_(readScalar(is)),
+    omega_(readScalar(is)),
+    delta_(readScalar(is))
+{}
+
+
+Foam::liquid::liquid(const dictionary& dict)
+:
+    W_(readScalar(dict.lookup("W"))),
+    Tc_(readScalar(dict.lookup("Tc"))),
+    Pc_(readScalar(dict.lookup("Pc"))),
+    Vc_(readScalar(dict.lookup("Vc"))),
+    dipm_(readScalar(dict.lookup("dipm"))),
+    omega_(readScalar(dict.lookup("omega"))),
+    delta_(readScalar(dict.lookup("delta")))
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
 Foam::autoPtr<Foam::liquid> Foam::liquid::New(Istream& is)
 {
     if (debug)
@@ -96,4 +151,56 @@ Foam::autoPtr<Foam::liquid> Foam::liquid::New(Istream& is)
 }
 
 
+Foam::autoPtr<Foam::liquid> Foam::liquid::New(const dictionary& dict)
+{
+    if (debug)
+    {
+        Info<< "liquid::New(const dictionary&) : " << "constructing liquid"
+            << endl;
+    }
+
+    const word& liquidTypeName = dict.dictName();
+
+    const Switch defaultCoeffs(dict.lookup("defaultCoeffs"));
+
+    if (defaultCoeffs)
+    {
+        ConstructorTable::iterator cstrIter =
+            ConstructorTablePtr_->find(liquidTypeName);
+
+        if (cstrIter == ConstructorTablePtr_->end())
+        {
+            FatalErrorIn("liquid::New(const dictionary&, const word&)")
+                << "Unknown liquid type "
+                << liquidTypeName << nl << nl
+                << "Valid liquid types are:" << nl
+                << ConstructorTablePtr_->sortedToc()
+                << abort(FatalError);
+        }
+
+        return autoPtr<liquid>(cstrIter()());
+    }
+    else
+    {
+        dictionaryConstructorTable::iterator cstrIter =
+            dictionaryConstructorTablePtr_->find(liquidTypeName);
+
+        if (cstrIter == dictionaryConstructorTablePtr_->end())
+        {
+            FatalErrorIn("liquid::New(const dictionary&, const word&)")
+                << "Unknown liquid type "
+                << liquidTypeName << nl << nl
+                << "Valid liquid types are:" << nl
+                << dictionaryConstructorTablePtr_->sortedToc()
+                << abort(FatalError);
+        }
+
+        return autoPtr<liquid>
+        (
+            cstrIter()(dict.subDict(liquidTypeName + "Coeffs"))
+        );
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/liquid/liquid.H b/src/thermophysicalModels/liquids/liquid/liquid.H
index 4203fca042..7db4131b99 100644
--- a/src/thermophysicalModels/liquids/liquid/liquid.H
+++ b/src/thermophysicalModels/liquids/liquid/liquid.H
@@ -40,6 +40,7 @@ SourceFiles
 #include "typeInfo.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -113,6 +114,15 @@ public:
             (is)
         );
 
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            liquid,
+            dictionary,
+            (const dictionary& dict),
+            (dict)
+        );
+
 
     // Constructors
 
@@ -130,36 +140,23 @@ public:
             scalar dipm,
             scalar omega,
             scalar delta
-        )
-        :
-            W_(W),
-            Tc_(Tc),
-            Pc_(Pc),
-            Vc_(Vc),
-            Zc_(Zc),
-            Tt_(Tt),
-            Pt_(Pt),
-            Tb_(Tb),
-            dipm_(dipm),
-            omega_(omega),
-            delta_(delta)
-        {}
+        );
 
         //- Construct from Istream
-        liquid(Istream& is)
-        :
-            W_(readScalar(is)),
-            Tc_(readScalar(is)),
-            Pc_(readScalar(is)),
-            Vc_(readScalar(is)),
-            dipm_(readScalar(is)),
-            omega_(readScalar(is)),
-            delta_(readScalar(is))
-        {}
+        liquid(Istream& is);
+
+        //- Construct from dictionary
+        liquid(const dictionary& dict);
+
+
+    // Selectors
 
         //- Return a pointer to a new liquid created from input
         static autoPtr<liquid> New(Istream& is);
 
+        //- Return a pointer to a new liquid created from dictionary
+        static autoPtr<liquid> New(const dictionary& dict);
+
 
     //- Destructor
     virtual ~liquid()
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
index 8641ed6cf8..ff696d1002 100644
--- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
+++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(nC3H8O, 0);
     addToRunTimeSelectionTable(liquid, nC3H8O,);
     addToRunTimeSelectionTable(liquid, nC3H8O, Istream);
+    addToRunTimeSelectionTable(liquid, nC3H8O, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::nC3H8O::nC3H8O(Istream& is)
 {}
 
 
+Foam::nC3H8O::nC3H8O(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
index 3761939ffa..c63f109fcf 100644
--- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
+++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
@@ -108,6 +108,9 @@ public:
         //- Construct from Istream
         nC3H8O(Istream& is);
 
+        //- Construct from dictionary
+        nC3H8O(const dictionary& dict);
+
 
     // Member Functions
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
index 72c42062b3..8450b1dd2f 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
@@ -38,6 +38,7 @@ SourceFiles
 #include "typeInfo.H"
 #include "runTimeSelectionTables.H"
 #include "Reaction.H"
+#include "ReactionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -103,11 +104,14 @@ public:
 
     // Member Functions
 
+        //- Return access to the list of species
         virtual const speciesTable& species() const = 0;
 
+        //- Return access to the thermo packages
         virtual const HashPtrTable<ThermoType>& speciesThermo() const = 0;
 
-        virtual const SLPtrList<Reaction<ThermoType> >& reactions() const = 0;
+        //- Return access to the list of reactions
+        virtual const ReactionList<ThermoType>& reactions() const = 0;
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index b36b09d787..31f07b28c7 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -296,8 +296,8 @@ List<specieElement> currentSpecieComposition(5);
 scalar currentLowT = 0;
 scalar currentHighT = 0;
 scalar currentCommonT = 0;
-gasThermoPhysics::coeffArray highCpCoeffs = {0, 0, 0, 0, 0, 0, 0};
-gasThermoPhysics::coeffArray lowCpCoeffs = {0, 0, 0, 0, 0, 0, 0};
+gasThermoPhysics::coeffArray highCpCoeffs(scalarList(7));
+gasThermoPhysics::coeffArray lowCpCoeffs(scalarList(7));
 
 gasReaction::specieCoeffs currentSpecieCoeff;
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
index b474c59451..f1676d5bd3 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
@@ -716,7 +716,7 @@ void Foam::chemkinReader::addReaction
                     Afactor*ArrheniusCoeffs[0],
                     ArrheniusCoeffs[1],
                     ArrheniusCoeffs[2]/RR,
-                    JanevCoeffs.begin()
+                    FixedList<scalar, 9>(JanevCoeffs)
                 )
             );
         }
@@ -738,7 +738,7 @@ void Foam::chemkinReader::addReaction
                     Afactor*ArrheniusCoeffs[0],
                     ArrheniusCoeffs[1],
                     ArrheniusCoeffs[2]/RR,
-                    powerSeriesCoeffs.begin()
+                    FixedList<scalar, 4>(powerSeriesCoeffs)
                 )
             );
         }
@@ -850,7 +850,6 @@ void Foam::chemkinReader::read
 
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::chemkinReader::chemkinReader
 (
     const fileName& CHEMKINFileName,
@@ -859,18 +858,19 @@ Foam::chemkinReader::chemkinReader
 :
     lineNo_(1),
     specieNames_(10),
-    speciesTable_()
+    speciesTable_(),
+    reactions_(speciesTable_, speciesThermo_)
 {
     read(CHEMKINFileName, thermoFileName);
 }
 
 
-// Construct from components
 Foam::chemkinReader::chemkinReader(const dictionary& thermoDict)
 :
     lineNo_(1),
     specieNames_(10),
-    speciesTable_()
+    speciesTable_(),
+    reactions_(speciesTable_, speciesThermo_)
 {
     fileName chemkinFile
     (
@@ -902,4 +902,5 @@ Foam::chemkinReader::chemkinReader(const dictionary& thermoDict)
     read(chemkinFile, thermoFile);
 }
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
index 67906b18b3..a4a89e6a8e 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
@@ -40,7 +40,7 @@ SourceFiles
 #include "fileName.H"
 #include "typeInfo.H"
 #include "HashPtrTable.H"
-#include "SLPtrList.H"
+#include "ReactionList.H"
 #include "DynamicList.H"
 #include "labelList.H"
 #include "speciesTable.H"
@@ -205,7 +205,7 @@ private:
         HashTable<List<specieElement> > specieComposition_;
 
         //- List of the reactions
-        SLPtrList<gasReaction> reactions_;
+        ReactionList<gasThermoPhysics> reactions_;
 
 
     // Private Member Functions
@@ -375,7 +375,7 @@ public:
         }
 
         //- List of the reactions
-        const SLPtrList<gasReaction>& reactions() const
+        const ReactionList<gasThermoPhysics>& reactions() const
         {
             return reactions_;
         }
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C
index 5e29a87a6e..99c98e6dea 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C
@@ -37,13 +37,11 @@ Foam::foamChemistryReader<ThermoType>::foamChemistryReader
 )
 :
     chemistryReader<ThermoType>(),
-    speciesThermo_(IFstream(thermoFileName)()),
-    speciesTable_(dictionary(IFstream(reactionsFileName)()).lookup("species")),
-    reactions_
-    (
-        dictionary(IFstream(reactionsFileName)()).lookup("reactions"),
-        Reaction<ThermoType>::iNew(speciesTable_, speciesThermo_)
-    )
+    chemDict_(IFstream(reactionsFileName.expand())),
+    thermoDict_(IFstream(thermoFileName.expand())),
+    speciesThermo_(thermoDict_),
+    speciesTable_(chemDict_.lookup("species")),
+    reactions_(speciesTable_, speciesThermo_, chemDict_)
 {}
 
 
@@ -54,34 +52,23 @@ Foam::foamChemistryReader<ThermoType>::foamChemistryReader
 )
 :
     chemistryReader<ThermoType>(),
-    speciesThermo_
+    chemDict_
+    (
+        IFstream
+        (
+            fileName(thermoDict.lookup("foamChemistryFile")).expand()
+        )()
+    ),
+    thermoDict_
     (
         IFstream
         (
             fileName(thermoDict.lookup("foamChemistryThermoFile")).expand()
         )()
     ),
-    speciesTable_
-    (
-        dictionary
-        (
-            IFstream
-            (
-                fileName(thermoDict.lookup("foamChemistryFile")).expand()
-            )()
-        ).lookup("species")
-    ),
-    reactions_
-    (
-        dictionary
-        (
-            IFstream
-            (
-                fileName(thermoDict.lookup("foamChemistryFile")).expand()
-            )()
-        ).lookup("reactions"),
-        typename Reaction<ThermoType>::iNew(speciesTable_, speciesThermo_)
-    )
+    speciesThermo_(thermoDict_),
+    speciesTable_(chemDict_.lookup("species")),
+    reactions_(speciesTable_, speciesThermo_, chemDict_)
 {}
 
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
index 5cba4d8b9f..a5bba9a397 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
@@ -39,7 +39,6 @@ SourceFiles
 #include "fileName.H"
 #include "typeInfo.H"
 #include "HashPtrTable.H"
-#include "SLPtrList.H"
 #include "labelList.H"
 #include "speciesTable.H"
 #include "atomicWeights.H"
@@ -58,6 +57,12 @@ class foamChemistryReader
 :
     public chemistryReader<ThermoType>
 {
+        //- Chemistry/reactions dictionary
+        dictionary chemDict_;
+
+        //- Thermo properties dictionary
+        dictionary thermoDict_;
+
         //- Table of the thermodynamic data given in the foamChemistry file
         HashPtrTable<ThermoType> speciesThermo_;
 
@@ -65,7 +70,7 @@ class foamChemistryReader
         speciesTable speciesTable_;
 
         //- List of the reactions
-        SLPtrList<Reaction<ThermoType> > reactions_;
+        ReactionList<ThermoType> reactions_;
 
 
     // Private Member Functions
@@ -117,7 +122,7 @@ public:
         }
 
         //- List of the reactions
-        const SLPtrList<Reaction<ThermoType> >& reactions() const
+        const ReactionList<ThermoType>& reactions() const
         {
             return reactions_;
         }
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.C
index 126823c624..4e64f39c7b 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.C
@@ -51,7 +51,7 @@ Foam::hCombustionThermo::hCombustionThermo(const fvMesh& mesh)
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionSet(0, 2, -2, 0, 0),
+        dimEnergy/dimMass,
         this->hBoundaryTypes()
     )
 {}
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
index 014ef3da51..8c698065a1 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
@@ -50,9 +50,9 @@ Foam::dieselMixture<ThermoType>::dieselMixture
 
     stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
 
-    fuel_(thermoDict.lookup("fuel")),
-    oxidant_(thermoDict.lookup("oxidant")),
-    products_(thermoDict.lookup("burntProducts")),
+    fuel_(thermoDict.subDict("fuel")),
+    oxidant_(thermoDict.subDict("oxidant")),
+    products_(thermoDict.subDict("burntProducts")),
 
     mixture_("mixture", fuel_),
 
@@ -91,9 +91,9 @@ const ThermoType& Foam::dieselMixture<ThermoType>::mixture
 template<class ThermoType>
 void Foam::dieselMixture<ThermoType>::read(const dictionary& thermoDict)
 {
-    fuel_ = ThermoType(thermoDict.lookup("fuel"));
-    oxidant_ = ThermoType(thermoDict.lookup("oxidant"));
-    products_ = ThermoType(thermoDict.lookup("burntProducts"));
+    fuel_ = ThermoType(thermoDict.subDict("fuel"));
+    oxidant_ = ThermoType(thermoDict.subDict("oxidant"));
+    products_ = ThermoType(thermoDict.subDict("burntProducts"));
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
index 06cf80a47f..7550ebf442 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
@@ -50,9 +50,9 @@ Foam::egrMixture<ThermoType>::egrMixture
 
     stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
 
-    fuel_(thermoDict.lookup("fuel")),
-    oxidant_(thermoDict.lookup("oxidant")),
-    products_(thermoDict.lookup("burntProducts")),
+    fuel_(thermoDict.subDict("fuel")),
+    oxidant_(thermoDict.subDict("oxidant")),
+    products_(thermoDict.subDict("burntProducts")),
 
     mixture_("mixture", fuel_),
 
@@ -101,9 +101,9 @@ void Foam::egrMixture<ThermoType>::read(const dictionary& thermoDict)
 {
     stoicRatio_ = thermoDict.lookup("stoichiometricAirFuelMassRatio");
 
-    fuel_ = ThermoType(thermoDict.lookup("fuel"));
-    oxidant_ = ThermoType(thermoDict.lookup("oxidant"));
-    products_ = ThermoType(thermoDict.lookup("burntProducts"));
+    fuel_ = ThermoType(thermoDict.subDict("fuel"));
+    oxidant_ = ThermoType(thermoDict.subDict("oxidant"));
+    products_ = ThermoType(thermoDict.subDict("burntProducts"));
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
index eca7ffd0d5..51705086b2 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
@@ -48,8 +48,8 @@ Foam::homogeneousMixture<ThermoType>::homogeneousMixture
         mesh
     ),
 
-    reactants_(thermoDict.lookup("reactants")),
-    products_(thermoDict.lookup("products")),
+    reactants_(thermoDict.subDict("reactants")),
+    products_(thermoDict.subDict("products")),
     mixture_("mixture", reactants_),
     b_(Y("b"))
 {}
@@ -84,8 +84,8 @@ const ThermoType& Foam::homogeneousMixture<ThermoType>::mixture
 template<class ThermoType>
 void Foam::homogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
 {
-    reactants_ = ThermoType(thermoDict.lookup("reactants"));
-    products_ = ThermoType(thermoDict.lookup("products"));
+    reactants_ = ThermoType(thermoDict.subDict("reactants"));
+    products_ = ThermoType(thermoDict.subDict("products"));
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
index 2ef52c112d..a4cfa2e9c0 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
@@ -51,9 +51,9 @@ Foam::inhomogeneousMixture<ThermoType>::inhomogeneousMixture
 
     stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
 
-    fuel_(thermoDict.lookup("fuel")),
-    oxidant_(thermoDict.lookup("oxidant")),
-    products_(thermoDict.lookup("burntProducts")),
+    fuel_(thermoDict.subDict("fuel")),
+    oxidant_(thermoDict.subDict("oxidant")),
+    products_(thermoDict.subDict("burntProducts")),
 
     mixture_("mixture", fuel_),
 
@@ -95,9 +95,9 @@ void Foam::inhomogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
 {
     stoicRatio_ = thermoDict.lookup("stoichiometricAirFuelMassRatio");
 
-    fuel_ = ThermoType(thermoDict.lookup("fuel"));
-    oxidant_ = ThermoType(thermoDict.lookup("oxidant"));
-    products_ = ThermoType(thermoDict.lookup("burntProducts"));
+    fuel_ = ThermoType(thermoDict.subDict("fuel"));
+    oxidant_ = ThermoType(thermoDict.subDict("oxidant"));
+    products_ = ThermoType(thermoDict.subDict("burntProducts"));
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index a30dd5dd1b..19f78a00c5 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -38,7 +38,7 @@ const ThermoType& Foam::multiComponentMixture<ThermoType>::constructSpeciesData
         speciesData_.set
         (
             i,
-            new ThermoType(thermoDict.lookup(species_[i]))
+            new ThermoType(thermoDict.subDict(species_[i]))
         );
     }
 
@@ -155,7 +155,7 @@ void Foam::multiComponentMixture<ThermoType>::read
 {
     forAll(species_, i)
     {
-        speciesData_[i] = ThermoType(thermoDict.lookup(species_[i]));
+        speciesData_[i] = ThermoType(thermoDict.subDict(species_[i]));
     }
 }
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C
index 3e10336dbb..a4b0081668 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C
@@ -48,11 +48,7 @@ Foam::reactingMixture<ThermoType>::reactingMixture
     ),
     PtrList<Reaction<ThermoType> >
     (
-        PtrList<Reaction<ThermoType> >
-        (
-            autoPtr<chemistryReader<ThermoType> >::operator()().reactions()
-        ),
-        this->species_
+        autoPtr<chemistryReader<ThermoType> >::operator()().reactions()
     )
 {
     autoPtr<chemistryReader<ThermoType> >::clear();
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
index 3684fc3e09..942f98cc7b 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
@@ -51,9 +51,9 @@ Foam::veryInhomogeneousMixture<ThermoType>::veryInhomogeneousMixture
 
     stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
 
-    fuel_(thermoDict.lookup("fuel")),
-    oxidant_(thermoDict.lookup("oxidant")),
-    products_(thermoDict.lookup("burntProducts")),
+    fuel_(thermoDict.subDict("fuel")),
+    oxidant_(thermoDict.subDict("oxidant")),
+    products_(thermoDict.subDict("burntProducts")),
 
     mixture_("mixture", fuel_),
 
@@ -96,9 +96,9 @@ void Foam::veryInhomogeneousMixture<ThermoType>::read
     const dictionary& thermoDict
 )
 {
-    fuel_ = ThermoType(thermoDict.lookup("fuel"));
-    oxidant_ = ThermoType(thermoDict.lookup("oxidant"));
-    products_ = ThermoType(thermoDict.lookup("burntProducts"));
+    fuel_ = ThermoType(thermoDict.subDict("fuel"));
+    oxidant_ = ThermoType(thermoDict.subDict("oxidant"));
+    products_ = ThermoType(thermoDict.subDict("burntProducts"));
 }
 
 
diff --git a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C
index 6cf5163397..a0a60c1534 100644
--- a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C
+++ b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C
@@ -49,11 +49,7 @@ Foam::solidMixture::solidMixture
 
     forAll(components_, i)
     {
-        properties_.set
-        (
-            i,
-            solid::New(props.lookup(components_[i]))
-        );
+        properties_.set(i, solid::New(props.subDict(components_[i])));
     }
 }
 
diff --git a/src/thermophysicalModels/solids/C/C.C b/src/thermophysicalModels/solids/C/C.C
index 317e3a3388..85dab6090d 100644
--- a/src/thermophysicalModels/solids/C/C.C
+++ b/src/thermophysicalModels/solids/C/C.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C, 0);
     addToRunTimeSelectionTable(solid, C,);
     addToRunTimeSelectionTable(solid, C, Istream);
+    addToRunTimeSelectionTable(solid, C, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -62,6 +63,12 @@ Foam::C::C(Istream& is)
 {}
 
 
+Foam::C::C(const dictionary& dict)
+:
+    solid(dict)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::C::writeData(Ostream& os) const
diff --git a/src/thermophysicalModels/solids/C/C.H b/src/thermophysicalModels/solids/C/C.H
index bab7f2cff2..5dc2e2b350 100644
--- a/src/thermophysicalModels/solids/C/C.H
+++ b/src/thermophysicalModels/solids/C/C.H
@@ -76,6 +76,9 @@ public:
         //- Construct from Istream
         C(Istream& is);
 
+        //- Construct from dictionary
+        C(const dictionary& dict);
+
 
     // I-O
 
diff --git a/src/thermophysicalModels/solids/CaCO3/CaCO3.C b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
index e7461a995b..3e20089555 100644
--- a/src/thermophysicalModels/solids/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(CaCO3, 0);
     addToRunTimeSelectionTable(solid, CaCO3,);
     addToRunTimeSelectionTable(solid, CaCO3, Istream);
+    addToRunTimeSelectionTable(solid, CaCO3, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -62,6 +63,12 @@ Foam::CaCO3::CaCO3(Istream& is)
 {}
 
 
+Foam::CaCO3::CaCO3(const dictionary& dict)
+:
+    solid(dict)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::CaCO3::writeData(Ostream& os) const
diff --git a/src/thermophysicalModels/solids/CaCO3/CaCO3.H b/src/thermophysicalModels/solids/CaCO3/CaCO3.H
index f284b06b6e..d5d725d938 100644
--- a/src/thermophysicalModels/solids/CaCO3/CaCO3.H
+++ b/src/thermophysicalModels/solids/CaCO3/CaCO3.H
@@ -77,6 +77,9 @@ public:
         //- Construct from Istream
         CaCO3(Istream& is);
 
+        //- Construct from dictionary
+        CaCO3(const dictionary& dict);
+
 
     // I-O
 
diff --git a/src/thermophysicalModels/solids/ash/ash.C b/src/thermophysicalModels/solids/ash/ash.C
index e4b4f934e7..e75119b8a7 100644
--- a/src/thermophysicalModels/solids/ash/ash.C
+++ b/src/thermophysicalModels/solids/ash/ash.C
@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(ash, 0);
     addToRunTimeSelectionTable(solid, ash,);
     addToRunTimeSelectionTable(solid, ash, Istream);
+    addToRunTimeSelectionTable(solid, ash, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -62,6 +63,12 @@ Foam::ash::ash(Istream& is)
 {}
 
 
+Foam::ash::ash(const dictionary& dict)
+:
+    solid(dict)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::ash::writeData(Ostream& os) const
diff --git a/src/thermophysicalModels/solids/ash/ash.H b/src/thermophysicalModels/solids/ash/ash.H
index 06430e4f7e..0769ffff83 100644
--- a/src/thermophysicalModels/solids/ash/ash.H
+++ b/src/thermophysicalModels/solids/ash/ash.H
@@ -77,6 +77,9 @@ public:
         //- Construct from Istream
         ash(Istream& is);
 
+        //- Construct from dictionary
+        ash(const dictionary& dict);
+
 
     // I-O
 
diff --git a/src/thermophysicalModels/solids/solid/solid.C b/src/thermophysicalModels/solids/solid/solid.C
index 35776ea125..0a3c4eaa46 100644
--- a/src/thermophysicalModels/solids/solid/solid.C
+++ b/src/thermophysicalModels/solids/solid/solid.C
@@ -32,6 +32,7 @@ namespace Foam
     defineTypeNameAndDebug(solid, 0);
     defineRunTimeSelectionTable(solid,);
     defineRunTimeSelectionTable(solid, Istream);
+    defineRunTimeSelectionTable(solid, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -63,6 +64,16 @@ Foam::solid::solid(Istream& is)
 {}
 
 
+Foam::solid::solid(const dictionary& dict)
+:
+    rho_(readScalar(dict.lookup("rho"))),
+    cp_(readScalar(dict.lookup("cp"))),
+    K_(readScalar(dict.lookup("K"))),
+    Hf_(readScalar(dict.lookup("Hf"))),
+    emissivity_(readScalar(dict.lookup("emissivity")))
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::solid::writeData(Ostream& os) const
diff --git a/src/thermophysicalModels/solids/solid/solid.H b/src/thermophysicalModels/solids/solid/solid.H
index 6655c8b65a..e66ece6ca8 100644
--- a/src/thermophysicalModels/solids/solid/solid.H
+++ b/src/thermophysicalModels/solids/solid/solid.H
@@ -38,6 +38,7 @@ SourceFiles
 #include "typeInfo.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,8 +49,8 @@ class solid;
 
 Ostream& operator<<
 (
-     Ostream&,
-     const solid&
+    Ostream&,
+    const solid&
 );
 
 
@@ -104,6 +105,15 @@ public:
         (is)
     );
 
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        solid,
+        dictionary,
+        (const dictionary& dict),
+        (dict)
+    );
+
 
     // Constructors
 
@@ -120,9 +130,15 @@ public:
         //- Construct from Istream
         solid(Istream& is);
 
+        //- Construct from dictionary
+        solid(const dictionary& dict);
+
         //- Return a pointer to a new solid created from input
         static autoPtr<solid> New(Istream& is);
 
+        //- Return a pointer to a new solid created from dictionary
+        static autoPtr<solid> New(const dictionary& dict);
+
 
     //- Destructor
     virtual ~solid()
diff --git a/src/thermophysicalModels/solids/solid/solidNew.C b/src/thermophysicalModels/solids/solid/solidNew.C
index 327c32af1d..c99fdc618e 100644
--- a/src/thermophysicalModels/solids/solid/solidNew.C
+++ b/src/thermophysicalModels/solids/solid/solidNew.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "solid.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -31,9 +32,7 @@ Foam::autoPtr<Foam::solid> Foam::solid::New(Istream& is)
 {
     if (debug)
     {
-        Info<< "solid::New(Istream&): "
-            << "constructing solid"
-            << endl;
+        Info<< "solid::New(Istream&): constructing solid" << endl;
     }
 
     const word solidType(is);
@@ -84,4 +83,49 @@ Foam::autoPtr<Foam::solid> Foam::solid::New(Istream& is)
 }
 
 
+Foam::autoPtr<Foam::solid> Foam::solid::New(const dictionary& dict)
+{
+    if (debug)
+    {
+        Info<< "solid::New(const dictionary&): constructing solid" << endl;
+    }
+
+    const word solidType(dict.dictName());
+    const Switch defaultCoeffs(dict.lookup("defaultCoeffs"));
+
+    if (defaultCoeffs)
+    {
+        ConstructorTable::iterator cstrIter =
+            ConstructorTablePtr_->find(solidType);
+
+        if (cstrIter == ConstructorTablePtr_->end())
+        {
+            FatalErrorIn("solid::New(const dictionary&)")
+                << "Unknown solid type " << solidType << nl << nl
+                << "Valid solid types are :" << endl
+                << ConstructorTablePtr_->sortedToc()
+                << exit(FatalError);
+        }
+
+        return autoPtr<solid>(cstrIter()());
+    }
+    else
+    {
+        dictionaryConstructorTable::iterator cstrIter =
+            dictionaryConstructorTablePtr_->find(solidType);
+
+        if (cstrIter == dictionaryConstructorTablePtr_->end())
+        {
+            FatalErrorIn("solid::New(const dictionary&)")
+                << "Unknown solid type " << solidType << nl << nl
+                << "Valid solid types are :" << endl
+                << dictionaryConstructorTablePtr_->sortedToc()
+                << exit(FatalError);
+        }
+
+        return autoPtr<solid>(cstrIter()(dict));
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
index 95ab12629d..5935b10102 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
@@ -37,9 +37,30 @@ template<int PolySize>
 icoPolynomial<PolySize>::icoPolynomial(Istream& is)
 :
     specie(is),
-    rhoPolynomial_("rhoPolynomial", is)
+    rhoCoeffs_("rhoCoeffs<" + Foam::name(PolySize) + '>', is)
 {
-    rhoPolynomial_ *= this->W();
+    rhoCoeffs_ *= this->W();
+}
+
+
+template<int PolySize>
+icoPolynomial<PolySize>::icoPolynomial(const dictionary& dict)
+:
+    specie(dict),
+    rhoCoeffs_(dict.lookup("rhoCoeffs<" + Foam::name(PolySize) + '>'))
+{
+    rhoCoeffs_ *= this->W();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+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;
 }
 
 
@@ -49,7 +70,8 @@ template<int PolySize>
 Ostream& operator<<(Ostream& os, const icoPolynomial<PolySize>& ip)
 {
     os  << static_cast<const specie&>(ip) << tab
-        << "rhoPolynomial" << tab << ip.rhoPolynomial_/ip.W();
+        << "rhoCoeffs<" << Foam::name(PolySize) << '>' << tab
+        << ip.rhoCoeffs_/ip.W();
 
     os.check
     (
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index 889837b8ad..894bdae3ad 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -98,9 +98,9 @@ class icoPolynomial
 {
     // Private data
 
-        //- Density
+        //- Density polynomial coefficients
         //  Note: input in [kg/m3], but internally uses [kg/m3/kmol]
-        Polynomial<PolySize> rhoPolynomial_;
+        Polynomial<PolySize> rhoCoeffs_;
 
 
 public:
@@ -117,6 +117,9 @@ public:
         //- Construct from Istream
         icoPolynomial(Istream&);
 
+        //- Construct from dictionary
+        icoPolynomial(const dictionary& dict);
+
         //- Construct as copy
         inline icoPolynomial(const icoPolynomial&);
 
@@ -129,17 +132,28 @@ public:
         // Selector from Istream
         inline static autoPtr<icoPolynomial> New(Istream& is);
 
+        // Selector from dictionary
+        inline static autoPtr<icoPolynomial> New(const dictionary& dict);
+
 
     // Member functions
 
-        //- Return density [kg/m^3]
-        inline scalar rho(scalar p, scalar T) const;
+        // Fundamental properties
 
-        //- Return compressibility rho/p [s^2/m^2]
-        inline scalar psi(scalar p, scalar T) const;
+            //- Return density [kg/m^3]
+            inline scalar rho(scalar p, scalar T) const;
 
-        //- Return compression factor []
-        inline scalar Z(scalar p, scalar T) const;
+            //- Return compressibility rho/p [s^2/m^2]
+            inline scalar psi(scalar p, scalar T) const;
+
+            //- Return compression factor []
+            inline scalar Z(scalar p, scalar T) const;
+
+
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
 
 
     // Member operators
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
index e4a1699e20..f1eeacef9e 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
@@ -31,11 +31,11 @@ template<int PolySize>
 inline Foam::icoPolynomial<PolySize>::icoPolynomial
 (
     const specie& sp,
-    const Polynomial<PolySize>& rhoPoly
+    const Polynomial<PolySize>& rhoCoeffs
 )
 :
     specie(sp),
-    rhoPolynomial_(rhoPoly)
+    rhoCoeffs_(rhoCoeffs)
 {}
 
 
@@ -48,7 +48,7 @@ inline Foam::icoPolynomial<PolySize>::icoPolynomial
 )
 :
     specie(ip),
-    rhoPolynomial_(ip.rhoPolynomial_)
+    rhoCoeffs_(ip.rhoCoeffs_)
 {}
 
 
@@ -60,7 +60,7 @@ inline Foam::icoPolynomial<PolySize>::icoPolynomial
 )
 :
     specie(name, ip),
-    rhoPolynomial_(ip.rhoPolynomial_)
+    rhoCoeffs_(ip.rhoCoeffs_)
 {}
 
 
@@ -83,12 +83,23 @@ Foam::icoPolynomial<PolySize>::New(Istream& is)
 }
 
 
+template<int PolySize>
+inline Foam::autoPtr<Foam::icoPolynomial<PolySize> >
+Foam::icoPolynomial<PolySize>::New(const dictionary& dict)
+{
+    return autoPtr<icoPolynomial<PolySize> >
+    (
+        new icoPolynomial<PolySize>(dict)
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<int PolySize>
 inline Foam::scalar Foam::icoPolynomial<PolySize>::rho(scalar, scalar T) const
 {
-    return rhoPolynomial_.evaluate(T)/this->W();
+    return rhoCoeffs_.evaluate(T)/this->W();
 }
 
 
@@ -116,7 +127,7 @@ inline Foam::icoPolynomial<PolySize>& Foam::icoPolynomial<PolySize>::operator=
 {
     specie::operator=(ip);
 
-    rhoPolynomial_ = ip.rhoPolynomial_;
+    rhoCoeffs_ = ip.rhoCoeffs_;
 
     return *this;
 }
@@ -135,7 +146,7 @@ inline void Foam::icoPolynomial<PolySize>::operator+=
     molr1 /= this->nMoles();
     scalar molr2 = ip.nMoles()/this->nMoles();
 
-    rhoPolynomial_ = molr1*rhoPolynomial_ + molr2*ip.rhoPolynomial_;
+    rhoCoeffs_ = molr1*rhoCoeffs_ + molr2*ip.rhoCoeffs_;
 }
 
 
@@ -152,7 +163,7 @@ inline void Foam::icoPolynomial<PolySize>::operator-=
     molr1 /= this->nMoles();
     scalar molr2 = ip.nMoles()/this->nMoles();
 
-    rhoPolynomial_ = molr1*rhoPolynomial_ - molr2*ip.rhoPolynomial_;
+    rhoCoeffs_ = molr1*rhoCoeffs_ - molr2*ip.rhoCoeffs_;
 }
 
 
@@ -180,7 +191,7 @@ Foam::icoPolynomial<PolySize> Foam::operator+
     (
         static_cast<const specie&>(ip1)
       + static_cast<const specie&>(ip2),
-        molr1*ip1.rhoPolynomial_ + molr2*ip2.rhoPolynomial_
+        molr1*ip1.rhoCoeffs_ + molr2*ip2.rhoCoeffs_
     );
 }
 
@@ -200,7 +211,7 @@ Foam::icoPolynomial<PolySize> Foam::operator-
     (
         static_cast<const specie&>(ip1)
       - static_cast<const specie&>(ip2),
-        molr1*ip1.rhoPolynomial_ - molr2*ip2.rhoPolynomial_
+        molr1*ip1.rhoCoeffs_ - molr2*ip2.rhoCoeffs_
     );
 }
 
@@ -215,7 +226,7 @@ Foam::icoPolynomial<PolySize> Foam::operator*
     return icoPolynomial<PolySize>
     (
         s*static_cast<const specie&>(ip),
-        ip.rhoPolynomial_
+        ip.rhoCoeffs_
     );
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
index 04c85a1344..f73335e225 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
@@ -26,14 +26,9 @@ License
 #include "perfectGas.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-perfectGas::perfectGas(Istream& is)
+Foam::perfectGas::perfectGas(Istream& is)
 :
     specie(is)
 {
@@ -41,9 +36,23 @@ perfectGas::perfectGas(Istream& is)
 }
 
 
+Foam::perfectGas::perfectGas(const dictionary& dict)
+:
+    specie(dict)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::perfectGas::write(Ostream& os) const
+{
+    specie::write(os);
+}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-Ostream& operator<<(Ostream& os, const perfectGas& pg)
+Foam::Ostream& Foam::operator<<(Ostream& os, const perfectGas& pg)
 {
     os  << static_cast<const specie&>(pg);
 
@@ -52,8 +61,4 @@ Ostream& operator<<(Ostream& os, const perfectGas& pg)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
index 10d42ad164..68425f2a7d 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
@@ -63,6 +63,9 @@ public:
         //- Construct from Istream
         perfectGas(Istream&);
 
+        //- Construct from dictionary
+        perfectGas(const dictionary& dict);
+
         //- Construct as named copy
         inline perfectGas(const word& name, const perfectGas&);
 
@@ -72,17 +75,28 @@ public:
         // Selector from Istream
         inline static autoPtr<perfectGas> New(Istream& is);
 
+        // Selector from dictionary
+        inline static autoPtr<perfectGas> New(const dictionary& dict);
+
 
     // Member functions
 
-        //- Return density [kg/m^3]
-        inline scalar rho(scalar p, scalar T) const;
+        // Fundamental properties
 
-        //- Return compressibility rho/p [s^2/m^2]
-        inline scalar psi(scalar p, scalar T) const;
+            //- Return density [kg/m^3]
+            inline scalar rho(scalar p, scalar T) const;
 
-        //- Return compression factor []
-        inline scalar Z(scalar p, scalar T) const;
+            //- Return compressibility rho/p [s^2/m^2]
+            inline scalar psi(scalar p, scalar T) const;
+
+            //- Return compression factor []
+            inline scalar Z(scalar p, scalar T) const;
+
+
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
 
 
     // Member operators
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
index 798e39343d..199bbd73f9 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
@@ -25,18 +25,9 @@ License
 
 #include "perfectGas.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Construct from components
-inline perfectGas::perfectGas
-(
-    const specie& sp
-)
+inline Foam::perfectGas::perfectGas(const specie& sp)
 :
     specie(sp)
 {}
@@ -44,43 +35,48 @@ inline perfectGas::perfectGas
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct as named copy
-inline perfectGas::perfectGas(const word& name, const perfectGas& pg)
+inline Foam::perfectGas::perfectGas(const word& name, const perfectGas& pg)
 :
     specie(name, pg)
 {}
 
 
-// Construct and return a clone
-inline autoPtr<perfectGas> perfectGas::clone() const
+inline Foam::autoPtr<Foam::perfectGas> Foam::perfectGas::clone() const
 {
     return autoPtr<perfectGas>(new perfectGas(*this));
 }
 
 
-// Selector from Istream
-inline autoPtr<perfectGas> perfectGas::New(Istream& is)
+inline Foam::autoPtr<Foam::perfectGas> Foam::perfectGas::New(Istream& is)
 {
     return autoPtr<perfectGas>(new perfectGas(is));
 }
 
 
+inline Foam::autoPtr<Foam::perfectGas> Foam::perfectGas::New
+(
+    const dictionary& dict
+)
+{
+    return autoPtr<perfectGas>(new perfectGas(dict));
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//- Return density [kg/m^3]
-inline scalar perfectGas::rho(scalar p, scalar T) const
+inline Foam::scalar Foam::perfectGas::rho(scalar p, scalar T) const
 {
     return p/(R()*T);
 }
 
-//- Return compressibility rho/p [s^2/m^2]
-inline scalar perfectGas::psi(scalar, scalar T) const
+
+inline Foam::scalar Foam::perfectGas::psi(scalar, scalar T) const
 {
     return 1.0/(R()*T);
 }
 
-//- Return compression factor []
-inline scalar perfectGas::Z(scalar, scalar) const
+
+inline Foam::scalar Foam::perfectGas::Z(scalar, scalar) const
 {
     return 1.0;
 }
@@ -88,17 +84,19 @@ inline scalar perfectGas::Z(scalar, scalar) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline void perfectGas::operator+=(const perfectGas& pg)
+inline void Foam::perfectGas::operator+=(const perfectGas& pg)
 {
     specie::operator+=(pg);
 }
 
-inline void perfectGas::operator-=(const perfectGas& pg)
+
+inline void Foam::perfectGas::operator-=(const perfectGas& pg)
 {
     specie::operator-=(pg);
 }
 
-inline void perfectGas::operator*=(const scalar s)
+
+inline void Foam::perfectGas::operator*=(const scalar s)
 {
     specie::operator*=(s);
 }
@@ -106,7 +104,7 @@ inline void perfectGas::operator*=(const scalar s)
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-inline perfectGas operator+
+inline Foam::perfectGas Foam::operator+
 (
     const perfectGas& pg1,
     const perfectGas& pg2
@@ -120,7 +118,7 @@ inline perfectGas operator+
 }
 
 
-inline perfectGas operator-
+inline Foam::perfectGas Foam::operator-
 (
     const perfectGas& pg1,
     const perfectGas& pg2
@@ -134,7 +132,7 @@ inline perfectGas operator-
 }
 
 
-inline perfectGas operator*
+inline Foam::perfectGas Foam::operator*
 (
     const scalar s,
     const perfectGas& pg
@@ -144,7 +142,7 @@ inline perfectGas operator*
 }
 
 
-inline perfectGas operator==
+inline Foam::perfectGas Foam::operator==
 (
     const perfectGas& pg1,
     const perfectGas& pg2
@@ -154,8 +152,4 @@ inline perfectGas operator==
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
index 7e810f1225..1d729b54ab 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
@@ -25,16 +25,10 @@ License
 
 #include "IrreversibleReaction.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 template<class ReactionThermo, class ReactionRate>
-IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
+Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
 (
     const Reaction<ReactionThermo>& reaction,
     const ReactionRate& k
@@ -45,9 +39,8 @@ IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
 {}
 
 
-// Construct from components
 template<class ReactionThermo, class ReactionRate>
-IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
+Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
 (
     const speciesTable& species,
     const HashPtrTable<ReactionThermo>& thermoDatabase,
@@ -59,9 +52,21 @@ IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
 {}
 
 
-// Construct as copy given new speciesTable
 template<class ReactionThermo, class ReactionRate>
-IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
+Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
+(
+    const speciesTable& species,
+    const HashPtrTable<ReactionThermo>& thermoDatabase,
+    const dictionary& dict
+)
+:
+    Reaction<ReactionThermo>(species, thermoDatabase, dict),
+    k_(species, dict)
+{}
+
+
+template<class ReactionThermo, class ReactionRate>
+Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
 (
     const IrreversibleReaction<ReactionThermo, ReactionRate>& irr,
     const speciesTable& species
@@ -75,7 +80,7 @@ IrreversibleReaction<ReactionThermo, ReactionRate>::IrreversibleReaction
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ReactionThermo, class ReactionRate>
-scalar IrreversibleReaction<ReactionThermo, ReactionRate>::kf
+Foam::scalar Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::kf
 (
     const scalar T,
     const scalar p,
@@ -87,18 +92,14 @@ scalar IrreversibleReaction<ReactionThermo, ReactionRate>::kf
 
 
 template<class ReactionThermo, class ReactionRate>
-void IrreversibleReaction<ReactionThermo, ReactionRate>::write
+void Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::write
 (
     Ostream& os
 ) const
 {
     Reaction<ReactionThermo>::write(os);
-    os  << token::SPACE << k_;
+    k_.write(os);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
index 46a6414e96..1c90ebef73 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class IrreversibleReaction Declaration
+                    Class IrreversibleReaction Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ReactionThermo, class ReactionRate>
@@ -96,6 +96,14 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        IrreversibleReaction
+        (
+            const speciesTable& species,
+            const HashPtrTable<ReactionThermo>& thermoDatabase,
+            const dictionary& dict
+        );
+
         //- Construct and return a clone
         virtual autoPtr<Reaction<ReactionThermo> > clone() const
         {
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
index 06befe7e8e..79cdaf263b 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
@@ -25,16 +25,10 @@ License
 
 #include "NonEquilibriumReversibleReaction.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 template<class ReactionThermo, class ReactionRate>
-NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
 NonEquilibriumReversibleReaction
 (
     const Reaction<ReactionThermo>& reaction,
@@ -48,9 +42,9 @@ NonEquilibriumReversibleReaction
 {}
 
 
-// Construct from components
+
 template<class ReactionThermo, class ReactionRate>
-NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
 NonEquilibriumReversibleReaction
 (
     const speciesTable& species,
@@ -63,9 +57,24 @@ NonEquilibriumReversibleReaction
     rk_(species, is)
 {}
 
-// Construct as copy given new speciesTable
+
 template<class ReactionThermo, class ReactionRate>
-NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
+NonEquilibriumReversibleReaction
+(
+    const speciesTable& species,
+    const HashPtrTable<ReactionThermo>& thermoDatabase,
+    const dictionary& dict
+)
+:
+    Reaction<ReactionThermo>(species, thermoDatabase, dict),
+    fk_(species, dict),
+    rk_(species, dict)
+{}
+
+
+template<class ReactionThermo, class ReactionRate>
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
 NonEquilibriumReversibleReaction
 (
     const NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>& nerr,
@@ -81,7 +90,8 @@ NonEquilibriumReversibleReaction
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ReactionThermo, class ReactionRate>
-scalar NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kf
+Foam::scalar
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kf
 (
     const scalar T,
     const scalar p,
@@ -93,7 +103,8 @@ scalar NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kf
 
 
 template<class ReactionThermo, class ReactionRate>
-scalar NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kr
+Foam::scalar
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kr
 (
     const scalar,
     const scalar T,
@@ -106,7 +117,8 @@ scalar NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kr
 
 
 template<class ReactionThermo, class ReactionRate>
-scalar NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kr
+Foam::scalar
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kr
 (
     const scalar T,
     const scalar p,
@@ -118,18 +130,15 @@ scalar NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kr
 
 
 template<class ReactionThermo, class ReactionRate>
-void NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::write
+void Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::write
 (
     Ostream& os
 ) const
 {
     Reaction<ReactionThermo>::write(os);
-    os  << token::SPACE << fk_ << token::SPACE << rk_;
+    fk_.write(os);
+    rk_.write(os);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
index 2cc66c430e..6c6ffee026 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class NonEquilibriumReversibleReaction Declaration
+             Class NonEquilibriumReversibleReaction Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ReactionThermo, class ReactionRate>
@@ -100,6 +100,14 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        NonEquilibriumReversibleReaction
+        (
+            const speciesTable& species,
+            const HashPtrTable<ReactionThermo>& thermoDatabase,
+            const dictionary& dict
+        );
+
         //- Construct and return a clone
         virtual autoPtr<Reaction<ReactionThermo> > clone() const
         {
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index 87b8eb123c..cad5fafc90 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -26,6 +26,53 @@ License
 #include "Reaction.H"
 #include "DynamicList.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class ReactionThermo>
+Foam::string Foam::Reaction<ReactionThermo>::reactionStr() const
+{
+    OStringStream reaction;
+
+    for (label i = 0; i < lhs_.size(); i++)
+    {
+        if (i > 0)
+        {
+            reaction << " + ";
+        }
+        if (mag(lhs_[i].stoichCoeff - 1) > SMALL)
+        {
+            reaction << lhs_[i].stoichCoeff;
+        }
+        reaction << species_[lhs_[i].index];
+        if (mag(lhs_[i].exponent - lhs_[i].stoichCoeff) > SMALL)
+        {
+            reaction << "^" << lhs_[i].exponent;
+        }
+    }
+
+    reaction << " = ";
+
+    for (label i = 0; i < rhs_.size(); i++)
+    {
+        if (i > 0)
+        {
+            reaction << " + ";
+        }
+        if (mag(rhs_[i].stoichCoeff - 1) > SMALL)
+        {
+            reaction << rhs_[i].stoichCoeff;
+        }
+        reaction << species_[rhs_[i].index];
+        if (mag(rhs_[i].exponent - rhs_[i].stoichCoeff) > SMALL)
+        {
+            reaction << "^" << rhs_[i].exponent;
+        }
+    }
+
+    return reaction.str();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ReactionThermo>
@@ -174,7 +221,7 @@ void Foam::Reaction<ReactionThermo>::setLRhs(Istream& is)
         }
     }
 
-    FatalIOErrorIn("Reaction<ReactionThermo>::lrhs(Istream& is)", is)
+    FatalIOErrorIn("Reaction<ReactionThermo>::setLRhs(Istream& is)", is)
         << "Cannot continue reading reaction data from stream"
         << exit(FatalIOError);
 }
@@ -196,6 +243,22 @@ Foam::Reaction<ReactionThermo>::Reaction
 }
 
 
+template<class ReactionThermo>
+Foam::Reaction<ReactionThermo>::Reaction
+(
+    const speciesTable& species,
+    const HashPtrTable<ReactionThermo>& thermoDatabase,
+    const dictionary& dict
+)
+:
+    ReactionThermo(*thermoDatabase[species[0]]),
+    species_(species)
+{
+    setLRhs(IStringStream(dict.lookup("reaction"))());
+    setThermo(thermoDatabase);
+}
+
+
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<class ReactionThermo>
@@ -211,11 +274,11 @@ Foam::Reaction<ReactionThermo>::New
     {
         FatalIOErrorIn
         (
-            "Reaction<ReactionThermo>::New(const speciesTable& species,"
-            " const HashPtrTable<ReactionThermo>& thermoDatabase, Istream&)",
+            "Reaction<ReactionThermo>::New(const speciesTable&, "
+            " const HashPtrTable<ReactionThermo>&, Istream&)",
             is
         )   << "Reaction type not specified" << nl << nl
-            << "Valid Reaction types are :" << endl
+            << "Valid Reaction types are :" << nl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
@@ -229,12 +292,12 @@ Foam::Reaction<ReactionThermo>::New
     {
         FatalIOErrorIn
         (
-            "Reaction<ReactionThermo>::New(const speciesTable& species,"
-            " const HashPtrTable<ReactionThermo>& thermoDatabase, Istream&)",
+            "Reaction<ReactionThermo>::New(const speciesTable&, "
+            " const HashPtrTable<ReactionThermo>&, Istream&)",
             is
         )   << "Unknown reaction type "
             << reactionTypeName << nl << nl
-            << "Valid reaction types are :" << endl
+            << "Valid reaction types are :" << nl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
@@ -246,60 +309,50 @@ Foam::Reaction<ReactionThermo>::New
 }
 
 
+template<class ReactionThermo>
+Foam::autoPtr<Foam::Reaction<ReactionThermo> >
+Foam::Reaction<ReactionThermo>::New
+(
+    const speciesTable& species,
+    const HashPtrTable<ReactionThermo>& thermoDatabase,
+    const dictionary& dict
+)
+{
+    const word& reactionTypeName = dict.dictName();
+
+    typename dictionaryConstructorTable::iterator cstrIter
+        = dictionaryConstructorTablePtr_->find(reactionTypeName);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "Reaction<ReactionThermo>::New"
+            "("
+                "const speciesTable&, "
+                "const HashPtrTable<ReactionThermo>&, "
+                "const dictionary&"
+            ")"
+        )   << "Unknown reaction type "
+            << reactionTypeName << nl << nl
+            << "Valid reaction types are :" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<Reaction<ReactionThermo> >
+    (
+        cstrIter()(species, thermoDatabase, dict)
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ReactionThermo>
 void Foam::Reaction<ReactionThermo>::write(Ostream& os) const
 {
-    os << type() << nl << "    ";
-
-    forAll(lhs_, i)
-    {
-        const typename Reaction<ReactionThermo>::specieCoeffs& sc = lhs_[i];
-
-        if (sc.stoichCoeff != 1)
-        {
-            os << sc.stoichCoeff;
-        }
-
-        os << species_[sc.index];
-
-        if (sc.exponent != sc.stoichCoeff)
-        {
-            os << '^' << sc.exponent;
-        }
-
-        if (i < lhs_.size() - 1)
-        {
-            os << " + ";
-        }
-    }
-
-    os << " = ";
-
-    forAll(rhs_, i)
-    {
-        const typename Reaction<ReactionThermo>::specieCoeffs& sc = rhs_[i];
-
-        if (sc.stoichCoeff != 1)
-        {
-            os << sc.stoichCoeff;
-        }
-
-        os << species_[sc.index];
-
-        if (sc.exponent != sc.stoichCoeff)
-        {
-            os << '^' << sc.exponent;
-        }
-
-        if (i < rhs_.size() - 1)
-        {
-            os << " + ";
-        }
-    }
-
-    os  << endl << "   ";
+    os.writeKeyword("reaction") << reactionStr() << token::END_STATEMENT << nl;
 }
 
 
@@ -327,6 +380,7 @@ Foam::scalar Foam::Reaction<ReactionThermo>::kr
     return 0.0;
 }
 
+
 template<class ReactionThermo>
 Foam::scalar Foam::Reaction<ReactionThermo>::kr
 (
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
index 73a704935a..0108e80105 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
@@ -124,7 +124,13 @@ private:
 
     // Private Member Functions
 
+        //- Return string representation of reaction
+        string reactionStr() const;
+
+        //- Construct the left- and right-hand-side reaction coefficients
         void setLRhs(Istream&);
+
+        //- Construct reaction thermo
         void setThermo(const HashPtrTable<ReactionThermo>& thermoDatabase);
 
         //- Disallow default bitwise assignment
@@ -152,6 +158,19 @@ public:
             (species, thermoDatabase, is)
         );
 
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            Reaction,
+            dictionary,
+            (
+                const speciesTable& species,
+                const HashPtrTable<ReactionThermo>& thermoDatabase,
+                const dictionary& dict
+            ),
+            (species, thermoDatabase, dict)
+        );
+
 
     // Public classes
 
@@ -205,6 +224,14 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        Reaction
+        (
+            const speciesTable& species,
+            const HashPtrTable<ReactionThermo>& thermoDatabase,
+            const dictionary& dict
+        );
+
         //- Construct and return a clone
         virtual autoPtr<Reaction<ReactionThermo> > clone() const
         {
@@ -229,12 +256,20 @@ public:
 
     // Selectors
 
-        //- Return a pointer to a new patchField created on freestore from input
+        //- Return a pointer to new patchField created on freestore from input
         static autoPtr<Reaction<ReactionThermo> > New
         (
             const speciesTable& species,
             const HashPtrTable<ReactionThermo>& thermoDatabase,
-            Istream&
+            Istream& is
+        );
+
+        //- Return a pointer to new patchField created on freestore from dict
+        static autoPtr<Reaction<ReactionThermo> > New
+        (
+            const speciesTable& species,
+            const HashPtrTable<ReactionThermo>& thermoDatabase,
+            const dictionary& dict
         );
 
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
index 7a6f93119d..c62106877e 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
@@ -53,7 +53,56 @@ Reaction<ReactionThermo>::rhs() const
 template<class ReactionThermo>
 inline Ostream& operator<<(Ostream& os, const Reaction<ReactionThermo>& r)
 {
-    r.write(os);
+    os << r.type() << nl << "    ";
+
+    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;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
new file mode 100644
index 0000000000..52b2984114
--- /dev/null
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+     \\/     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 "ReactionList.H"
+#include "IFstream.H"
+#include "SLPtrList.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ThermoType>
+Foam::ReactionList<ThermoType>::ReactionList
+(
+    const speciesTable& species,
+    const HashPtrTable<ThermoType>& thermoDb
+)
+:
+    SLPtrList<Reaction<ThermoType> >(),
+    species_(species),
+    thermoDb_(thermoDb),
+    dict_(dictionary::null)
+{}
+
+
+template<class ThermoType>
+Foam::ReactionList<ThermoType>::ReactionList
+(
+    const speciesTable& species,
+    const HashPtrTable<ThermoType>& thermoDb,
+    const dictionary& dict
+)
+:
+    SLPtrList<Reaction<ThermoType> >(),
+    species_(species),
+    thermoDb_(thermoDb),
+    dict_(dict)
+{
+    readReactionDict();
+}
+
+
+template<class ThermoType>
+Foam::ReactionList<ThermoType>::ReactionList
+(
+    const speciesTable& species,
+    const HashPtrTable<ThermoType>& thermoDb,
+    const fileName& fName
+)
+:
+    SLPtrList<Reaction<ThermoType> >
+    (
+        dictionary(IFstream(fName)()).lookup("reactions"),
+        Reaction<ThermoType>::iNew(species, thermoDb)
+    ),
+    species_(species),
+    thermoDb_(thermoDb),
+    dict_(dictionary::null)
+{}
+
+
+template<class ThermoType>
+Foam::ReactionList<ThermoType>::ReactionList(const ReactionList& reactions)
+:
+    SLPtrList<Reaction<ThermoType> >(reactions),
+    species_(reactions.species_),
+    thermoDb_(reactions.thermoDb_),
+    dict_(reactions.dict_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class ThermoType>
+Foam::ReactionList<ThermoType>::~ReactionList()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ThermoType>
+bool Foam::ReactionList<ThermoType>::readReactionDict()
+{
+    const dictionary& reactions(dict_.subDict("reactions"));
+
+    forAllConstIter(dictionary, reactions, iter)
+    {
+        this->append
+        (
+            Reaction<ThermoType>::New
+            (
+                species_,
+                thermoDb_,
+                reactions.subDict(iter().keyword())
+            ).ptr()
+        );
+    }
+
+    return true;
+}
+
+
+template<class ThermoType>
+void Foam::ReactionList<ThermoType>::write(Ostream& os) const
+{
+    os  << "reactions" << nl;
+    os  << token::BEGIN_BLOCK << incrIndent << nl;
+
+    forAllConstIter(typename SLPtrList<Reaction<ThermoType> >, *this, iter)
+    {
+        const Reaction<ThermoType>& r = iter();
+        os  << indent << r.type() << nl
+            << indent << token::BEGIN_BLOCK << incrIndent << nl;
+        r.write(os);
+        os  << decrIndent << indent << token::END_BLOCK << nl;
+    }
+
+    os << decrIndent << token::END_BLOCK << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
new file mode 100644
index 0000000000..d9bf05ab15
--- /dev/null
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+     \\/     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::ReactionList
+
+Description
+    List of templated reactions
+
+SourceFiles
+    ReactionList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ReactionList_H
+#define ReactionList_H
+
+#include "PtrList.H"
+#include "SLPtrList.H"
+#include "speciesTable.H"
+#include "HashPtrTable.H"
+#include "Reaction.H"
+#include "fileName.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class ReactionList Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ThermoType>
+class ReactionList
+:
+    public SLPtrList<Reaction<ThermoType> >
+{
+    // Private data
+
+        //- Reference to the table of species
+        const speciesTable& species_;
+
+        //- Reference to the thermo database
+        const HashPtrTable<ThermoType>& thermoDb_;
+
+        //- The dictionary used for construction
+        const dictionary dict_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise assignment
+        void operator=(const ReactionList&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        ReactionList
+        (
+            const speciesTable& species,
+            const HashPtrTable<ThermoType>& thermoDatabase
+        );
+
+        //- Construct from dictionary
+        ReactionList
+        (
+            const speciesTable& species,
+            const HashPtrTable<ThermoType>& thermoDatabase,
+            const dictionary& dict
+        );
+
+        //- Construct from file using (Istream)
+        ReactionList
+        (
+            const speciesTable& species,
+            const HashPtrTable<ThermoType>& thermoDatabase,
+            const fileName& fName
+        );
+
+        //- Construct copy
+        ReactionList(const ReactionList<ThermoType>& reactions);
+
+
+    //- Destructor
+    ~ReactionList();
+
+
+    // Public Member Functions
+
+        //- Read reactions from dictionary
+        bool readReactionDict();
+
+        //- Write
+        void write(Ostream& os) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ReactionList.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
index 6456299ede..83b9721c97 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
@@ -25,16 +25,10 @@ License
 
 #include "ReversibleReaction.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 template<class ReactionThermo, class ReactionRate>
-ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
+Foam::ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
 (
     const Reaction<ReactionThermo>& reaction,
     const ReactionRate& k
@@ -45,9 +39,8 @@ ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
 {}
 
 
-// Construct from components
 template<class ReactionThermo, class ReactionRate>
-ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
+Foam::ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
 (
     const speciesTable& species,
     const HashPtrTable<ReactionThermo>& thermoDatabase,
@@ -59,9 +52,21 @@ ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
 {}
 
 
-// Construct as copy given new speciesTable
 template<class ReactionThermo, class ReactionRate>
-ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
+Foam::ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
+(
+    const speciesTable& species,
+    const HashPtrTable<ReactionThermo>& thermoDatabase,
+    const dictionary& dict
+)
+:
+    Reaction<ReactionThermo>(species, thermoDatabase, dict),
+    k_(species, dict)
+{}
+
+
+template<class ReactionThermo, class ReactionRate>
+Foam::ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
 (
     const ReversibleReaction<ReactionThermo, ReactionRate>& rr,
     const speciesTable& species
@@ -75,7 +80,7 @@ ReversibleReaction<ReactionThermo, ReactionRate>::ReversibleReaction
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ReactionThermo, class ReactionRate>
-scalar ReversibleReaction<ReactionThermo, ReactionRate>::kf
+Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::kf
 (
     const scalar T,
     const scalar p,
@@ -87,7 +92,7 @@ scalar ReversibleReaction<ReactionThermo, ReactionRate>::kf
 
 
 template<class ReactionThermo, class ReactionRate>
-scalar ReversibleReaction<ReactionThermo, ReactionRate>::kr
+Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::kr
 (
     const scalar kfwd,
     const scalar T,
@@ -100,7 +105,7 @@ scalar ReversibleReaction<ReactionThermo, ReactionRate>::kr
 
 
 template<class ReactionThermo, class ReactionRate>
-scalar ReversibleReaction<ReactionThermo, ReactionRate>::kr
+Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::kr
 (
     const scalar T,
     const scalar p,
@@ -112,18 +117,14 @@ scalar ReversibleReaction<ReactionThermo, ReactionRate>::kr
 
 
 template<class ReactionThermo, class ReactionRate>
-void ReversibleReaction<ReactionThermo, ReactionRate>::write
+void Foam::ReversibleReaction<ReactionThermo, ReactionRate>::write
 (
     Ostream& os
 ) const
 {
     Reaction<ReactionThermo>::write(os);
-    os  << token::SPACE << k_;
+    k_.write(os);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
index b2f115957d..a035ac1bb5 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class ReversibleReaction Declaration
+                     Class ReversibleReaction Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ReactionThermo, class ReactionRate>
@@ -93,6 +93,14 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        ReversibleReaction
+        (
+            const speciesTable& species,
+            const HashPtrTable<ReactionThermo>& thermoDatabase,
+            const dictionary& dict
+        );
+
         //- Construct and return a clone
         virtual autoPtr<Reaction<ReactionThermo> > clone() const
         {
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
index a20955e15a..87e3509a59 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
@@ -25,7 +25,9 @@ Class
     Foam::ArrheniusReactionRate
 
 Description
-    Arrhenius reaction rate.
+    Arrhenius reaction rate given by:
+
+        k = A * T^beta * exp(-Ta/T)
 
 SourceFiles
     ArrheniusReactionRateI.H
@@ -44,7 +46,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class ArrheniusReactionRate Declaration
+                    Class ArrheniusReactionRate Declaration
 \*---------------------------------------------------------------------------*/
 
 class ArrheniusReactionRate
@@ -75,6 +77,13 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        inline ArrheniusReactionRate
+        (
+            const speciesTable& species,
+            const dictionary& dict
+        );
+
 
     // Member Functions
 
@@ -91,6 +100,9 @@ public:
             const scalarField& c
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
index 25ad2db342..7db23243d6 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
@@ -23,15 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-inline ArrheniusReactionRate::ArrheniusReactionRate
+inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
 (
     const scalar A,
     const scalar beta,
@@ -44,8 +38,7 @@ inline ArrheniusReactionRate::ArrheniusReactionRate
 {}
 
 
-//- Construct from Istream
-inline ArrheniusReactionRate::ArrheniusReactionRate
+inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
 (
     const speciesTable&,
     Istream& is
@@ -59,9 +52,21 @@ inline ArrheniusReactionRate::ArrheniusReactionRate
 }
 
 
+inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
+(
+    const speciesTable&,
+    const dictionary& dict
+)
+:
+    A_(readScalar(dict.lookup("A"))),
+    beta_(readScalar(dict.lookup("beta"))),
+    Ta_(readScalar(dict.lookup("Ta")))
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline scalar ArrheniusReactionRate::operator()
+inline Foam::scalar Foam::ArrheniusReactionRate::operator()
 (
     const scalar T,
     const scalar,
@@ -84,7 +89,19 @@ inline scalar ArrheniusReactionRate::operator()
 }
 
 
-inline Ostream& operator<<(Ostream& os, const ArrheniusReactionRate& arr)
+inline void Foam::ArrheniusReactionRate::write(Ostream& os) const
+{
+    os.writeKeyword("A") << A_ << token::END_STATEMENT << nl;
+    os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl;
+    os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl;
+}
+
+
+inline Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const ArrheniusReactionRate& arr
+)
 {
     os  << token::BEGIN_LIST
         << arr.A_ << token::SPACE << arr.beta_ << token::SPACE << arr.Ta_
@@ -93,8 +110,4 @@ inline Ostream& operator<<(Ostream& os, const ArrheniusReactionRate& arr)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
index 3930d3ec19..6697e49ed0 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
@@ -91,6 +91,13 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        inline ChemicallyActivatedReactionRate
+        (
+            const speciesTable& species,
+            const dictionary& dict
+        );
+
 
     // Member Functions
 
@@ -109,6 +116,9 @@ public:
             const scalarField& c
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
index b857aa4080..e96e9f2878 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
@@ -25,16 +25,12 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-// Construct from components
 template<class ReactionRate, class ChemicallyActivationFunction>
-inline
-ChemicallyActivatedReactionRate<ReactionRate, ChemicallyActivationFunction>::
-ChemicallyActivatedReactionRate
+inline Foam::ChemicallyActivatedReactionRate
+<
+    ReactionRate,
+    ChemicallyActivationFunction
+>::ChemicallyActivatedReactionRate
 (
     const ReactionRate& k0,
     const ReactionRate& kInf,
@@ -49,11 +45,12 @@ ChemicallyActivatedReactionRate
 {}
 
 
-//- Construct from Istream
 template<class ReactionRate, class ChemicallyActivationFunction>
-inline
-ChemicallyActivatedReactionRate<ReactionRate, ChemicallyActivationFunction>::
-ChemicallyActivatedReactionRate
+inline Foam::ChemicallyActivatedReactionRate
+<
+    ReactionRate,
+    ChemicallyActivationFunction
+>::ChemicallyActivatedReactionRate
 (
     const speciesTable& species,
     Istream& is
@@ -68,11 +65,32 @@ ChemicallyActivatedReactionRate
 }
 
 
+template<class ReactionRate, class ChemicallyActivationFunction>
+inline Foam::ChemicallyActivatedReactionRate
+<
+    ReactionRate,
+    ChemicallyActivationFunction
+>::ChemicallyActivatedReactionRate
+(
+    const speciesTable& species,
+    const dictionary& dict
+)
+:
+    k0_(species, dict),
+    kInf_(species, dict),
+    F_(dict),
+    thirdBodyEfficiencies_(species, dict)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ReactionRate, class ChemicallyActivationFunction>
-inline scalar ChemicallyActivatedReactionRate
-    <ReactionRate, ChemicallyActivationFunction>::operator()
+inline Foam::scalar Foam::ChemicallyActivatedReactionRate
+<
+    ReactionRate,
+    ChemicallyActivationFunction
+>::operator()
 (
     const scalar T,
     const scalar p,
@@ -89,7 +107,21 @@ inline scalar ChemicallyActivatedReactionRate
 
 
 template<class ReactionRate, class ChemicallyActivationFunction>
-inline Ostream& operator<<
+inline void Foam::ChemicallyActivatedReactionRate
+<
+    ReactionRate,
+    ChemicallyActivationFunction
+>::write(Ostream& os) const
+{
+    k0_.write(os);
+    kInf_.write(os);
+    F_.write(os);
+    thirdBodyEfficiencies_.write(os);
+}
+
+
+template<class ReactionRate, class ChemicallyActivationFunction>
+inline Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
     const ChemicallyActivatedReactionRate
@@ -103,8 +135,4 @@ inline Ostream& operator<<
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
index fb62a4f56b..5c98b860d6 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
@@ -56,7 +56,7 @@ inline Ostream& operator<<
 
 
 /*---------------------------------------------------------------------------*\
-              Class FallOffReactionRate Declaration
+                    Class FallOffReactionRate Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ReactionRate, class FallOffFunction>
@@ -90,6 +90,13 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        inline FallOffReactionRate
+        (
+            const speciesTable& species,
+            const dictionary& dict
+        );
+
 
     // Member Functions
 
@@ -106,6 +113,9 @@ public:
             const scalarField& c
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
index d69531116c..d72bcee163 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
@@ -23,16 +23,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 template<class ReactionRate, class FallOffFunction>
-inline FallOffReactionRate<ReactionRate, FallOffFunction>::FallOffReactionRate
+inline Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::
+FallOffReactionRate
 (
     const ReactionRate& k0,
     const ReactionRate& kInf,
@@ -47,9 +42,9 @@ inline FallOffReactionRate<ReactionRate, FallOffFunction>::FallOffReactionRate
 {}
 
 
-//- Construct from Istream
 template<class ReactionRate, class FallOffFunction>
-inline FallOffReactionRate<ReactionRate, FallOffFunction>::FallOffReactionRate
+inline Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::
+FallOffReactionRate
 (
     const speciesTable& species,
     Istream& is
@@ -64,10 +59,26 @@ inline FallOffReactionRate<ReactionRate, FallOffFunction>::FallOffReactionRate
 }
 
 
+template<class ReactionRate, class FallOffFunction>
+inline Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::
+FallOffReactionRate
+(
+    const speciesTable& species,
+    const dictionary& dict
+)
+:
+    k0_(species, dict),
+    kInf_(species, dict),
+    F_(dict),
+    thirdBodyEfficiencies_(species, dict)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ReactionRate, class FallOffFunction>
-inline scalar FallOffReactionRate<ReactionRate, FallOffFunction>::operator()
+inline Foam::scalar
+Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::operator()
 (
     const scalar T,
     const scalar p,
@@ -84,7 +95,20 @@ inline scalar FallOffReactionRate<ReactionRate, FallOffFunction>::operator()
 
 
 template<class ReactionRate, class FallOffFunction>
-inline Ostream& operator<<
+inline void Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::write
+(
+    Ostream& os
+) const
+{
+    k0_.write(os);
+    kInf_.write(os);
+    F_.write(os);
+    thirdBodyEfficiencies_.write(os);
+}
+
+
+template<class ReactionRate, class FallOffFunction>
+inline Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
     const FallOffReactionRate<ReactionRate, FallOffFunction>& forr
@@ -100,8 +124,4 @@ inline Ostream& operator<<
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
index a497883e33..a98d841a88 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
@@ -37,6 +37,7 @@ SourceFiles
 
 #include "scalarField.H"
 #include "typeInfo.H"
+#include "FixedList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,7 +45,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class JanevReactionRate Declaration
+                     Class JanevReactionRate Declaration
 \*---------------------------------------------------------------------------*/
 
 class JanevReactionRate
@@ -56,7 +57,7 @@ class JanevReactionRate
         scalar Ta_;
 
         static const label nb_ = 9;
-        scalar b_[nb_];
+        FixedList<scalar, nb_> b_;
 
 
 public:
@@ -69,7 +70,7 @@ public:
             const scalar A,
             const scalar beta,
             const scalar Ta,
-            const scalar b[]
+            const FixedList<scalar, nb_> b
         );
 
         //- Construct from Istream
@@ -79,6 +80,13 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        inline JanevReactionRate
+        (
+            const speciesTable& species,
+            const dictionary& dict
+        );
+
 
     // Member Functions
 
@@ -95,6 +103,9 @@ public:
             const scalarField& c
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
index 5a073c2363..c5a55a9c97 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
@@ -23,35 +23,24 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-inline JanevReactionRate::JanevReactionRate
+inline Foam::JanevReactionRate::JanevReactionRate
 (
     const scalar A,
     const scalar beta,
     const scalar Ta,
-    const scalar b[]
+    const FixedList<scalar, nb_> b
 )
 :
     A_(A),
     beta_(beta),
-    Ta_(Ta)
-{
-    for (int n=0; n<nb_; n++)
-    {
-        b_[n] = b[n];
-    }
-}
+    Ta_(Ta),
+    b_(b)
+{}
 
 
-//- Construct from Istream
-inline JanevReactionRate::JanevReactionRate
+inline Foam::JanevReactionRate::JanevReactionRate
 (
     const speciesTable&,
     Istream& is
@@ -59,20 +48,29 @@ inline JanevReactionRate::JanevReactionRate
 :
     A_(readScalar(is.readBegin("JanevReactionRate(Istream&)"))),
     beta_(readScalar(is)),
-    Ta_(readScalar(is))
+    Ta_(readScalar(is)),
+    b_(is)
 {
-    for (int n=0; n<nb_; n++)
-    {
-        is >> b_[n];
-    }
-
     is.readEnd("JanevReactionRate(Istream&)");
 }
 
 
+inline Foam::JanevReactionRate::JanevReactionRate
+(
+    const speciesTable&,
+    const dictionary& dict
+)
+:
+    A_(readScalar(dict.lookup("A"))),
+    beta_(readScalar(dict.lookup("beta"))),
+    Ta_(readScalar(dict.lookup("Ta"))),
+    b_(dict.lookup("b"))
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline scalar JanevReactionRate::operator()
+inline Foam::scalar Foam::JanevReactionRate::operator()
 (
     const scalar T,
     const scalar,
@@ -106,7 +104,20 @@ inline scalar JanevReactionRate::operator()
 }
 
 
-inline Ostream& operator<<(Ostream& os, const JanevReactionRate& jrr)
+inline void Foam::JanevReactionRate::write(Ostream& os) const
+{
+    os.writeKeyword("A") << A_ << nl;
+    os.writeKeyword("beta") << beta_ << nl;
+    os.writeKeyword("Ta") << Ta_ << nl;
+    os.writeKeyword("b") << b_ << nl;
+}
+
+
+inline Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const JanevReactionRate& jrr
+)
 {
     os  << token::BEGIN_LIST
         << jrr.A_ << token::SPACE << jrr.beta_ << token::SPACE << jrr.Ta_;
@@ -122,8 +133,4 @@ inline Ostream& operator<<(Ostream& os, const JanevReactionRate& jrr)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
index 46c6ced463..8cde7c2bc8 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class LandauTellerReactionRate Declaration
+                   Class LandauTellerReactionRate Declaration
 \*---------------------------------------------------------------------------*/
 
 class LandauTellerReactionRate
@@ -57,6 +57,7 @@ class LandauTellerReactionRate
         scalar B_;
         scalar C_;
 
+
 public:
 
     // Constructors
@@ -78,6 +79,13 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        inline LandauTellerReactionRate
+        (
+            const speciesTable& species,
+            const dictionary& dict
+        );
+
 
     // Member Functions
 
@@ -94,6 +102,9 @@ public:
             const scalarField& c
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
index 2ef12e1868..7931222697 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
@@ -23,15 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-inline LandauTellerReactionRate::LandauTellerReactionRate
+inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
 (
     const scalar A,
     const scalar beta,
@@ -48,8 +42,7 @@ inline LandauTellerReactionRate::LandauTellerReactionRate
 {}
 
 
-//- Construct from Istream
-inline LandauTellerReactionRate::LandauTellerReactionRate
+inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
 (
     const speciesTable&,
     Istream& is
@@ -65,9 +58,23 @@ inline LandauTellerReactionRate::LandauTellerReactionRate
 }
 
 
+inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
+(
+    const speciesTable&,
+    const dictionary& dict
+)
+:
+    A_(readScalar(dict.lookup("A"))),
+    beta_(readScalar(dict.lookup("beta"))),
+    Ta_(readScalar(dict.lookup("Ta"))),
+    B_(readScalar(dict.lookup("B"))),
+    C_(readScalar(dict.lookup("C")))
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline scalar LandauTellerReactionRate::operator()
+inline Foam::scalar Foam::LandauTellerReactionRate::operator()
 (
     const scalar T,
     const scalar,
@@ -107,7 +114,21 @@ inline scalar LandauTellerReactionRate::operator()
 }
 
 
-inline Ostream& operator<<(Ostream& os, const LandauTellerReactionRate& arr)
+inline void Foam::LandauTellerReactionRate::write(Ostream& os) const
+{
+    os.writeKeyword("A") << A_ << token::END_STATEMENT << nl;
+    os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl;
+    os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl;
+    os.writeKeyword("B") << B_ << token::END_STATEMENT << nl;
+    os.writeKeyword("C") << C_ << token::END_STATEMENT << nl;
+}
+
+
+inline Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const LandauTellerReactionRate& arr
+)
 {
     os  << token::BEGIN_LIST
         << arr.A_ << token::SPACE << arr.beta_ << token::SPACE << arr.Ta_
@@ -117,8 +138,4 @@ inline Ostream& operator<<(Ostream& os, const LandauTellerReactionRate& arr)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
index 93a6e70c02..118bae3f09 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
@@ -81,6 +81,13 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        inline LangmuirHinshelwoodReactionRate
+        (
+            const speciesTable& species,
+            const dictionary& dict
+        );
+
 
     // Member Functions
 
@@ -97,6 +104,9 @@ public:
             const scalarField& c
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
index 3bc8d92b55..51bac5d59e 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
@@ -23,15 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "FixedList.H"
+#include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-inline LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
+inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
 (
     const scalar A[],
     const scalar Ta[],
@@ -52,8 +49,7 @@ inline LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
 }
 
 
-//- Construct from Istream
-inline LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
+inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
 (
     const speciesTable& st,
     Istream& is
@@ -74,9 +70,30 @@ inline LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
 }
 
 
+inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
+(
+    const speciesTable& st,
+    const dictionary& dict
+)
+:
+    co_(st["CO"]),
+    c3h6_(st["C3H6"]),
+    no_(st["NO"])
+{
+    // read (A, Ta) pairs
+    FixedList<Tuple2<scalar, scalar>, n_> coeffs(dict.lookup("coeffs"));
+
+    forAll(coeffs, i)
+    {
+        A_[i] = coeffs[i].first();
+        Ta_[i] = coeffs[i].second();
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline scalar LangmuirHinshelwoodReactionRate::operator()
+inline Foam::scalar Foam::LangmuirHinshelwoodReactionRate::operator()
 (
     const scalar T,
     const scalar,
@@ -93,7 +110,21 @@ inline scalar LangmuirHinshelwoodReactionRate::operator()
 }
 
 
-inline Ostream& operator<<
+inline void Foam::LangmuirHinshelwoodReactionRate::write(Ostream& os) const
+{
+    FixedList<Tuple2<scalar, scalar>, n_> coeffs;
+
+    forAll(coeffs, i)
+    {
+        coeffs[i].first() = A_[i];
+        coeffs[i].second() = Ta_[i];
+    }
+
+    os.writeKeyword("coeffs") << coeffs << nl;
+}
+
+
+inline Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
     const LangmuirHinshelwoodReactionRate& lhrr
@@ -103,7 +134,8 @@ inline Ostream& operator<<
 
     for (int i=0; i<LangmuirHinshelwoodReactionRate::n_; i++)
     {
-        os  << token::SPACE << lhrr.A_[i] << token::SPACE << lhrr.Ta_[i];
+        os  << token::SPACE
+            << '(' << lhrr.A_[i] << token::SPACE << lhrr.Ta_[i] << ')';
     }
 
     os << token::END_LIST;
@@ -112,8 +144,4 @@ inline Ostream& operator<<
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H
index e992125f17..4202f74844 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H
@@ -49,7 +49,7 @@ Ostream& operator<<(Ostream&, const LindemannFallOffFunction&);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class LindemannFallOffFunction Declaration
+                 Class LindemannFallOffFunction Declaration
 \*---------------------------------------------------------------------------*/
 
 class LindemannFallOffFunction
@@ -65,6 +65,9 @@ public:
         //- Construct from Istream
         inline LindemannFallOffFunction(Istream&);
 
+        //- Construct from dictionary
+        inline LindemannFallOffFunction(const dictionary& dict);
+
 
     // Member Functions
 
@@ -80,6 +83,9 @@ public:
             const scalar Pr
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H
index 65c9a35ac2..bdcff41200 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H
@@ -25,16 +25,21 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct null
 inline Foam::LindemannFallOffFunction::LindemannFallOffFunction()
 {}
 
 
-//- Construct from Istream
 inline Foam::LindemannFallOffFunction::LindemannFallOffFunction(Istream&)
 {}
 
 
+inline Foam::LindemannFallOffFunction::LindemannFallOffFunction
+(
+    const dictionary& dict
+)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 inline Foam::scalar Foam::LindemannFallOffFunction::operator()
@@ -47,6 +52,10 @@ inline Foam::scalar Foam::LindemannFallOffFunction::operator()
 }
 
 
+inline void Foam::LindemannFallOffFunction::write(Ostream& os) const
+{}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 inline Foam::Ostream& Foam::operator<<
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H
index 580e023914..66c7b77b95 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H
@@ -49,7 +49,7 @@ Ostream& operator<<(Ostream&, const SRIFallOffFunction&);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class SRIFallOffFunction Declaration
+                    Class SRIFallOffFunction Declaration
 \*---------------------------------------------------------------------------*/
 
 class SRIFallOffFunction
@@ -76,6 +76,9 @@ public:
         //- Construct from Istream
         inline SRIFallOffFunction(Istream&);
 
+        //- Construct from dictionary
+        inline SRIFallOffFunction(const dictionary& dict);
+
 
     // Member Functions
 
@@ -91,6 +94,9 @@ public:
             const scalar Pr
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
index de7b4970e7..d9af2b227a 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
@@ -25,7 +25,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 inline Foam::SRIFallOffFunction::SRIFallOffFunction
 (
     const scalar a,
@@ -43,7 +42,6 @@ inline Foam::SRIFallOffFunction::SRIFallOffFunction
 {}
 
 
-// Construct from Istream
 inline Foam::SRIFallOffFunction::SRIFallOffFunction(Istream& is)
 :
     a_(readScalar(is.readBegin("SRIFallOffFunction(Istream&)"))),
@@ -56,6 +54,16 @@ inline Foam::SRIFallOffFunction::SRIFallOffFunction(Istream& is)
 }
 
 
+inline Foam::SRIFallOffFunction::SRIFallOffFunction(const dictionary& dict)
+:
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    c_(readScalar(dict.lookup("c"))),
+    d_(readScalar(dict.lookup("d"))),
+    e_(readScalar(dict.lookup("e")))
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 inline Foam::scalar Foam::SRIFallOffFunction::operator()
@@ -69,6 +77,16 @@ inline Foam::scalar Foam::SRIFallOffFunction::operator()
 }
 
 
+inline void Foam::SRIFallOffFunction::write(Ostream& os) const
+{
+    os.writeKeyword("a") << a_ << token::END_STATEMENT << nl;
+    os.writeKeyword("b") << b_ << token::END_STATEMENT << nl;
+    os.writeKeyword("c") << c_ << token::END_STATEMENT << nl;
+    os.writeKeyword("d") << d_ << token::END_STATEMENT << nl;
+    os.writeKeyword("e") << e_ << token::END_STATEMENT << nl;
+}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 inline Foam::Ostream& Foam::operator<<
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H
index 55fac55220..64baa4f890 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H
@@ -49,7 +49,7 @@ Ostream& operator<<(Ostream&, const TroeFallOffFunction&);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class TroeFallOffFunction Declaration
+                     Class TroeFallOffFunction Declaration
 \*---------------------------------------------------------------------------*/
 
 class TroeFallOffFunction
@@ -76,6 +76,9 @@ public:
         //- Construct from Istream
         inline TroeFallOffFunction(Istream&);
 
+        //- Construct from dictionary
+        inline TroeFallOffFunction(const dictionary& dict);
+
 
     // Member Functions
 
@@ -91,6 +94,9 @@ public:
             const scalar Pr
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
index 8350b674fb..97858887f7 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
@@ -25,7 +25,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 inline Foam::TroeFallOffFunction::TroeFallOffFunction
 (
     const scalar alpha,
@@ -41,7 +40,6 @@ inline Foam::TroeFallOffFunction::TroeFallOffFunction
 {}
 
 
-// Construct from Istream
 inline Foam::TroeFallOffFunction::TroeFallOffFunction(Istream& is)
 :
     alpha_(readScalar(is.readBegin("TroeFallOffFunction(Istream&)"))),
@@ -53,6 +51,15 @@ inline Foam::TroeFallOffFunction::TroeFallOffFunction(Istream& is)
 }
 
 
+inline Foam::TroeFallOffFunction::TroeFallOffFunction(const dictionary& dict)
+:
+    alpha_(readScalar(dict.lookup("alpha"))),
+    Tsss_(readScalar(dict.lookup("Tsss"))),
+    Ts_(readScalar(dict.lookup("Ts"))),
+    Tss_(readScalar(dict.lookup("Tss")))
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 inline Foam::scalar Foam::TroeFallOffFunction::operator()
@@ -79,6 +86,15 @@ inline Foam::scalar Foam::TroeFallOffFunction::operator()
 }
 
 
+inline void Foam::TroeFallOffFunction::write(Ostream& os) const
+{
+    os.writeKeyword("alpha") << alpha_ << token::END_STATEMENT << nl;
+    os.writeKeyword("Tsss") << Tsss_ << token::END_STATEMENT << nl;
+    os.writeKeyword("Ts") << Ts_ << token::END_STATEMENT << nl;
+    os.writeKeyword("Tss") << Tss_ << token::END_STATEMENT << nl;
+}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 inline Foam::Ostream& Foam::operator<<
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
index 0193b7f716..ce92828a72 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
@@ -37,6 +37,7 @@ SourceFiles
 
 #include "scalarField.H"
 #include "typeInfo.H"
+#include "FixedList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,7 +45,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class powerSeriesReactionRate Declaration
+                   Class powerSeriesReactionRate Declaration
 \*---------------------------------------------------------------------------*/
 
 class powerSeriesReactionRate
@@ -55,8 +56,8 @@ class powerSeriesReactionRate
         scalar beta_;
         scalar Ta_;
 
-        static const label nb_ = 4;
-        scalar b_[nb_];
+        static const label nCoeff_ = 4;
+        FixedList<scalar, nCoeff_> coeffs_;
 
 
 public:
@@ -69,7 +70,7 @@ public:
             const scalar A,
             const scalar beta,
             const scalar Ta,
-            const scalar b[]
+            const FixedList<scalar, nCoeff_> coeffs
         );
 
         //- Construct from Istream
@@ -79,6 +80,13 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        inline powerSeriesReactionRate
+        (
+            const speciesTable& species,
+            const dictionary& dict
+        );
+
 
     // Member Functions
 
@@ -95,6 +103,9 @@ public:
             const scalarField& c
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
index d9a3ea4f2a..b6391f8441 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
@@ -23,35 +23,24 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-inline powerSeriesReactionRate::powerSeriesReactionRate
+inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
 (
     const scalar A,
     const scalar beta,
     const scalar Ta,
-    const scalar b[]
+    const FixedList<scalar, nCoeff_> coeffs
 )
 :
     A_(A),
     beta_(beta),
-    Ta_(Ta)
-{
-    for (int n=0; n<nb_; n++)
-    {
-        b_[n] = b[n];
-    }
-}
+    Ta_(Ta),
+    coeffs_(coeffs)
+{}
 
 
-//- Construct from Istream
-inline powerSeriesReactionRate::powerSeriesReactionRate
+inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
 (
     const speciesTable&,
     Istream& is
@@ -59,20 +48,29 @@ inline powerSeriesReactionRate::powerSeriesReactionRate
 :
     A_(readScalar(is.readBegin("powerSeriesReactionRate(Istream&)"))),
     beta_(readScalar(is)),
-    Ta_(readScalar(is))
+    Ta_(readScalar(is)),
+    coeffs_(is)
 {
-    for (int n=0; n<nb_; n++)
-    {
-        is >> b_[n];
-    }
-
     is.readEnd("powerSeriesReactionRate(Istream&)");
 }
 
 
+inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
+(
+    const speciesTable&,
+    const dictionary& dict
+)
+:
+    A_(readScalar(dict.lookup("A"))),
+    beta_(readScalar(dict.lookup("beta"))),
+    Ta_(readScalar(dict.lookup("Ta"))),
+    coeffs_(dict.lookup("coeffs"))
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline scalar powerSeriesReactionRate::operator()
+inline Foam::scalar Foam::powerSeriesReactionRate::operator()
 (
     const scalar T,
     const scalar,
@@ -88,9 +86,9 @@ inline scalar powerSeriesReactionRate::operator()
 
     scalar expArg = 0.0;
 
-    for (int n=0; n<nb_; n++)
+    forAll(coeffs_, n)
     {
-        expArg += b_[n]/pow(T, n);
+        expArg += coeffs_[n]/pow(T, n);
     }
 
     lta *= exp(expArg);
@@ -99,14 +97,27 @@ inline scalar powerSeriesReactionRate::operator()
 }
 
 
-inline Ostream& operator<<(Ostream& os, const powerSeriesReactionRate& psrr)
+inline void Foam::powerSeriesReactionRate::write(Ostream& os) const
+{
+    os.writeKeyword("A") << A_ << token::END_STATEMENT << nl;
+    os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl;
+    os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl;
+    os.writeKeyword("coeffs") << coeffs_ << token::END_STATEMENT << nl;
+}
+
+
+inline Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const powerSeriesReactionRate& psrr
+)
 {
     os  << token::BEGIN_LIST
         << psrr.A_ << token::SPACE << psrr.beta_ << token::SPACE << psrr.Ta_;
 
-    for (int n=0; n<powerSeriesReactionRate::nb_; n++)
+    for (int n=0; n<powerSeriesReactionRate::nCoeff_; n++)
     {
-        os  << token::SPACE << psrr.b_[n];
+        os  << token::SPACE << psrr.coeffs_[n];
     }
 
     os << token::END_LIST;
@@ -115,8 +126,4 @@ inline Ostream& operator<<(Ostream& os, const powerSeriesReactionRate& psrr)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
index b462c74254..1cf3a5d8b8 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
@@ -76,6 +76,13 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        inline thirdBodyArrheniusReactionRate
+        (
+            const speciesTable& species,
+            const dictionary& dict
+        );
+
 
     // Member Functions
 
@@ -92,6 +99,9 @@ public:
             const scalarField& c
         ) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
index 38bc148eac..91cd4dfdfb 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
@@ -23,15 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-inline thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
+inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
 (
     const scalar A,
     const scalar beta,
@@ -44,8 +38,7 @@ inline thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
 {}
 
 
-//- Construct from Istream
-inline thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
+inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
 (
     const speciesTable& species,
     Istream& is
@@ -62,9 +55,24 @@ inline thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
 }
 
 
+inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
+(
+    const speciesTable& species,
+    const dictionary& dict
+)
+:
+    ArrheniusReactionRate
+    (
+        species,
+        dict
+    ),
+    thirdBodyEfficiencies_(species, dict)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline scalar thirdBodyArrheniusReactionRate::operator()
+inline Foam::scalar Foam::thirdBodyArrheniusReactionRate::operator()
 (
     const scalar T,
     const scalar p,
@@ -77,7 +85,14 @@ inline scalar thirdBodyArrheniusReactionRate::operator()
 }
 
 
-inline Ostream& operator<<
+inline void Foam::thirdBodyArrheniusReactionRate::write(Ostream& os) const
+{
+    ArrheniusReactionRate::write(os);
+    thirdBodyEfficiencies_.write(os);
+}
+
+
+inline Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
     const thirdBodyArrheniusReactionRate& arr
@@ -91,8 +106,4 @@ inline Ostream& operator<<
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H
index 0f46db8dd4..d168174f8d 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H
@@ -50,7 +50,7 @@ Ostream& operator<<(Ostream&, const thirdBodyEfficiencies&);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class thirdBodyEfficiencies Declaration
+                  Class thirdBodyEfficiencies Declaration
 \*---------------------------------------------------------------------------*/
 
 class thirdBodyEfficiencies
@@ -80,12 +80,23 @@ public:
             Istream& is
         );
 
+        //- Construct from dictionary
+        inline thirdBodyEfficiencies
+        (
+            const speciesTable& species,
+            const dictionary& dict
+        );
+
 
     // Member functions
 
         //- Calculate and return M, the concentration of the third-bodies
         inline scalar M(const scalarList& c) const;
 
+        //- Write to stream
+        inline void write(Ostream& os) const;
+
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index dd6008f09e..c1dddc3f1e 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -23,9 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "Tuple2.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct from components
 inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 (
     const speciesTable& species,
@@ -48,7 +49,6 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 }
 
 
-//- Construct from Istream
 inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 (
     const speciesTable& species,
@@ -111,6 +111,42 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 }
 
 
+inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
+(
+    const speciesTable& species,
+    const dictionary& dict
+)
+:
+    scalarList(species.size()),
+    species_(species)
+{
+    if (dict.found("coeffs"))
+    {
+        List<Tuple2<word, scalar> > coeffs(dict.lookup("coeffs"));
+        if (coeffs.size() != species_.size())
+        {
+            FatalErrorIn
+            (
+                "thirdBodyEfficiencies::thirdBodyEfficiencies"
+                "(const speciesTable&, const dictionary&)"
+            )   << "number of efficiencies = " << coeffs.size()
+                << " is not equat to the number of species " << species_.size()
+                << exit(FatalIOError);
+        }
+
+        forAll(coeffs, i)
+        {
+            operator[](species[coeffs[i].first()]) = coeffs[i].second();
+        }
+    }
+    else
+    {
+        scalar defaultEff = readScalar(dict.lookup("defaultEfficiency"));
+        scalarList::operator=(defaultEff);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member functions  * * * * * * * * * * * * * //
 
 inline Foam::scalar Foam::thirdBodyEfficiencies::M(const scalarList& c) const
@@ -125,6 +161,19 @@ inline Foam::scalar Foam::thirdBodyEfficiencies::M(const scalarList& c) const
 }
 
 
+inline void Foam::thirdBodyEfficiencies::write(Ostream& os) const
+{
+    List<Tuple2<word, scalar> > coeffs(species_.size());
+    forAll(coeffs, i)
+    {
+        coeffs[i].first() = species_[i];
+        coeffs[i].second() = operator[](i);
+    }
+
+    os.writeKeyword("coeffs") << coeffs << token::END_STATEMENT << nl;
+}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 inline Foam::Ostream& Foam::operator<<
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
index 43b1ab4507..ba34115bde 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
@@ -47,6 +47,7 @@ namespace Foam
 
 defineTemplateTypeNameAndDebug(gasReaction, 0);
 defineTemplateRunTimeSelectionTable(gasReaction, Istream);
+defineTemplateRunTimeSelectionTable(gasReaction, dictionary);
 
 
 // * * * * * * * * * * * * * Make CHEMKIN reactions  * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H
index 0837c28d03..8a0d3b3001 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H
@@ -77,8 +77,16 @@ namespace Foam
         Reaction##Thermo,                                                     \
         ReactionType##Thermo##ReactionRate,                                   \
         Istream                                                               \
+    );                                                                        \
+                                                                              \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        Reaction##Thermo,                                                     \
+        ReactionType##Thermo##ReactionRate,                                   \
+        dictionary                                                            \
     );
 
+
 #define makePressureDependentReaction\
 (                                                                             \
     Thermo,                                                                   \
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
index 8974891b88..ceb8f6ee44 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
@@ -47,6 +47,7 @@ namespace Foam
 
 defineTemplateTypeNameAndDebug(icoPoly8Reaction, 0);
 defineTemplateRunTimeSelectionTable(icoPoly8Reaction, Istream);
+defineTemplateRunTimeSelectionTable(icoPoly8Reaction, dictionary);
 
 
 // * * * * * * * * * * * * * Make CHEMKIN reactions  * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C
index 35ba05ea11..d83a0dfb3f 100644
--- a/src/thermophysicalModels/specie/specie/specie.C
+++ b/src/thermophysicalModels/specie/specie/specie.C
@@ -51,6 +51,23 @@ Foam::specie::specie(Istream& is)
 }
 
 
+Foam::specie::specie(const dictionary& dict)
+:
+    name_(dict.dictName()),
+    nMoles_(readScalar(dict.lookup("nMoles"))),
+    molWeight_(readScalar(dict.lookup("molWeight")))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::specie::write(Ostream& os) const
+{
+    os.writeKeyword("nMoles") << nMoles_ << token::END_STATEMENT << nl;
+    os.writeKeyword("molWeight") << molWeight_ << token::END_STATEMENT << nl;
+}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const specie& st)
diff --git a/src/thermophysicalModels/specie/specie/specie.H b/src/thermophysicalModels/specie/specie/specie.H
index e4cd6cf908..ee3ee3769e 100644
--- a/src/thermophysicalModels/specie/specie/specie.H
+++ b/src/thermophysicalModels/specie/specie/specie.H
@@ -38,6 +38,7 @@ SourceFiles
 
 #include "word.H"
 #include "scalar.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,11 +69,7 @@ class specie
     // Private Member Functions
 
         //- Construct from components without name
-        inline specie
-        (
-            const scalar nMoles,
-            const scalar molWeight
-        );
+        inline specie(const scalar nMoles, const scalar molWeight);
 
 
 public:
@@ -110,11 +107,17 @@ public:
         //- Construct from Istream
         specie(Istream&);
 
+        //- Construct from dictionary
+        specie(const dictionary& dict);
+
 
     // Member Functions
 
         // Access
 
+            //- Name
+            inline const word& name() const;
+
             //- Molecular weight [kg/kmol]
             inline scalar W() const;
 
@@ -125,6 +128,12 @@ public:
             inline scalar R() const;
 
 
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
+
+
     // Member operators
 
         inline void operator=(const specie&);
diff --git a/src/thermophysicalModels/specie/specie/specieI.H b/src/thermophysicalModels/specie/specie/specieI.H
index 21892aba7d..d04df6e1a2 100644
--- a/src/thermophysicalModels/specie/specie/specieI.H
+++ b/src/thermophysicalModels/specie/specie/specieI.H
@@ -32,7 +32,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Construct from components
 inline specie::specie
 (
     const word& name,
@@ -46,7 +45,6 @@ inline specie::specie
 {}
 
 
-// Construct from components without name
 inline specie::specie
 (
     const scalar nMoles,
@@ -60,7 +58,6 @@ inline specie::specie
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct as copy
 inline specie::specie(const specie& st)
 :
     name_(st.name_),
@@ -69,7 +66,6 @@ inline specie::specie(const specie& st)
 {}
 
 
-// Construct as named copy
 inline specie::specie(const word& name, const specie& st)
 :
     name_(name),
@@ -80,19 +76,24 @@ inline specie::specie(const word& name, const specie& st)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//- Molecular weight [kg/kmol]
+inline const word& specie::name() const
+{
+    return name_;
+}
+
+
 inline scalar specie::W() const
 {
     return molWeight_;
 }
 
-//- No of moles of this species in mixture
+
 inline scalar specie::nMoles() const
 {
     return nMoles_;
 }
 
-//- Gas constant [J/(kg K)]
+
 inline scalar specie::R() const
 {
     return RR/molWeight_;
@@ -103,7 +104,7 @@ inline scalar specie::R() const
 
 inline void specie::operator=(const specie& st)
 {
-  //name_ = st.name_;
+    //name_ = st.name_;
     nMoles_ = st.nMoles_;
     molWeight_ = st.molWeight_;
 }
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
index fb7b8489da..f03e8d9e89 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
@@ -28,30 +28,50 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class equationOfState>
-Foam::eConstThermo<equationOfState>::eConstThermo(Istream& is)
+template<class EquationOfState>
+Foam::eConstThermo<EquationOfState>::eConstThermo(Istream& is)
 :
-    equationOfState(is),
+    EquationOfState(is),
     Cv_(readScalar(is)),
     Hf_(readScalar(is))
 {
-    is.check("eConstThermo::eConstThermo(Istream& is)");
+    is.check("eConstThermo<EquationOfState>::eConstThermo(Istream&)");
+}
+
+
+template<class EquationOfState>
+Foam::eConstThermo<EquationOfState>::eConstThermo(const dictionary& dict)
+:
+    EquationOfState(dict),
+    Cv_(readScalar(dict.lookup("Cv"))),
+    Hf_(readScalar(dict.lookup("Hf")))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+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;
 }
 
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-template<class equationOfState>
+template<class EquationOfState>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const eConstThermo<equationOfState>& ct
+    const eConstThermo<EquationOfState>& ct
 )
 {
-    os  << static_cast<const equationOfState&>(ct) << tab
+    os  << static_cast<const EquationOfState&>(ct) << tab
         << ct.Cv_ << tab << ct.Hf_;
 
-    os.check("Ostream& operator<<(Ostream& os, const eConstThermo& ct)");
+    os.check("Ostream& operator<<(Ostream&, const eConstThermo&)");
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
index 91dc5af60b..450dd714f6 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
@@ -46,41 +46,41 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-template<class equationOfState> class eConstThermo;
+template<class EquationOfState> class eConstThermo;
 
-template<class equationOfState>
-inline eConstThermo<equationOfState> operator+
+template<class EquationOfState>
+inline eConstThermo<EquationOfState> operator+
 (
-    const eConstThermo<equationOfState>&,
-    const eConstThermo<equationOfState>&
+    const eConstThermo<EquationOfState>&,
+    const eConstThermo<EquationOfState>&
 );
 
-template<class equationOfState>
-inline eConstThermo<equationOfState> operator-
+template<class EquationOfState>
+inline eConstThermo<EquationOfState> operator-
 (
-    const eConstThermo<equationOfState>&,
-    const eConstThermo<equationOfState>&
+    const eConstThermo<EquationOfState>&,
+    const eConstThermo<EquationOfState>&
 );
 
-template<class equationOfState>
-inline eConstThermo<equationOfState> operator*
+template<class EquationOfState>
+inline eConstThermo<EquationOfState> operator*
 (
     const scalar,
-    const eConstThermo<equationOfState>&
+    const eConstThermo<EquationOfState>&
 );
 
-template<class equationOfState>
-inline eConstThermo<equationOfState> operator==
+template<class EquationOfState>
+inline eConstThermo<EquationOfState> operator==
 (
-    const eConstThermo<equationOfState>&,
-    const eConstThermo<equationOfState>&
+    const eConstThermo<EquationOfState>&,
+    const eConstThermo<EquationOfState>&
 );
 
-template<class equationOfState>
+template<class EquationOfState>
 Ostream& operator<<
 (
     Ostream&,
-    const eConstThermo<equationOfState>&
+    const eConstThermo<EquationOfState>&
 );
 
 
@@ -88,10 +88,10 @@ Ostream& operator<<
                         Class eConstThermo Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class equationOfState>
+template<class EquationOfState>
 class eConstThermo
 :
-    public equationOfState
+    public EquationOfState
 {
     // Private data
 
@@ -104,7 +104,7 @@ class eConstThermo
         //- Construct from components
         inline eConstThermo
         (
-            const equationOfState& st,
+            const EquationOfState& st,
             const scalar cv,
             const scalar hf
         );
@@ -117,6 +117,9 @@ public:
         //- Construct from Istream
         eConstThermo(Istream&);
 
+        //- Construct from dictionary
+        eConstThermo(const dictionary& dict);
+
         //- Construct as named copy
         inline eConstThermo(const word&, const eConstThermo&);
 
@@ -126,10 +129,13 @@ public:
         // Selector from Istream
         inline static autoPtr<eConstThermo> New(Istream& is);
 
+        // Selector from dictionary
+        inline static autoPtr<eConstThermo> New(const dictionary& dict);
+
 
     // Member Functions
 
-        // Fundamaental properties
+        // Fundamental properties
 
             //- Heat capacity at constant pressure [J/(kmol K)]
             inline scalar cp(const scalar T) const;
@@ -147,6 +153,12 @@ public:
             inline scalar s(const scalar T) const;
 
 
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
+
+
     // Member operators
 
         inline void operator+=(const eConstThermo&);
@@ -155,25 +167,25 @@ public:
 
     // Friend operators
 
-        friend eConstThermo operator+ <equationOfState>
+        friend eConstThermo operator+ <EquationOfState>
         (
             const eConstThermo&,
             const eConstThermo&
         );
 
-        friend eConstThermo operator- <equationOfState>
+        friend eConstThermo operator- <EquationOfState>
         (
             const eConstThermo&,
             const eConstThermo&
         );
 
-        friend eConstThermo operator* <equationOfState>
+        friend eConstThermo operator* <EquationOfState>
         (
             const scalar,
             const eConstThermo&
         );
 
-        friend eConstThermo operator== <equationOfState>
+        friend eConstThermo operator== <EquationOfState>
         (
             const eConstThermo&,
             const eConstThermo&
@@ -182,7 +194,7 @@ public:
 
     // IOstream Operators
 
-        friend Ostream& operator<< <equationOfState>
+        friend Ostream& operator<< <EquationOfState>
         (
             Ostream&,
             const eConstThermo&
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
index c0357855a5..f2a117a00b 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
@@ -25,15 +25,15 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class equationOfState>
-inline Foam::eConstThermo<equationOfState>::eConstThermo
+template<class EquationOfState>
+inline Foam::eConstThermo<EquationOfState>::eConstThermo
 (
-    const equationOfState& st,
+    const EquationOfState& st,
     const scalar cv,
     const scalar hf
 )
 :
-    equationOfState(st),
+    EquationOfState(st),
     Cv_(cv),
     Hf_(hf)
 {}
@@ -41,45 +41,56 @@ inline Foam::eConstThermo<equationOfState>::eConstThermo
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class equationOfState>
-inline Foam::eConstThermo<equationOfState>::eConstThermo
+template<class EquationOfState>
+inline Foam::eConstThermo<EquationOfState>::eConstThermo
 (
     const word& name,
-    const eConstThermo<equationOfState>& ct
+    const eConstThermo<EquationOfState>& ct
 )
 :
-    equationOfState(name, ct),
+    EquationOfState(name, ct),
     Cv_(ct.Cv_),
     Hf_(ct.Hf_)
 {}
 
 
-template<class equationOfState>
-inline Foam::autoPtr<Foam::eConstThermo<equationOfState> >
-Foam::eConstThermo<equationOfState>::clone() const
+template<class EquationOfState>
+inline Foam::autoPtr<Foam::eConstThermo<EquationOfState> >
+Foam::eConstThermo<EquationOfState>::clone() const
 {
-    return autoPtr<eConstThermo<equationOfState> >
+    return autoPtr<eConstThermo<EquationOfState> >
     (
-        new eConstThermo<equationOfState>(*this)
+        new eConstThermo<EquationOfState>(*this)
     );
 }
 
 
-template<class equationOfState>
-inline Foam::autoPtr<Foam::eConstThermo<equationOfState> >
-Foam::eConstThermo<equationOfState>::New(Istream& is)
+template<class EquationOfState>
+inline Foam::autoPtr<Foam::eConstThermo<EquationOfState> >
+Foam::eConstThermo<EquationOfState>::New(Istream& is)
 {
-    return autoPtr<eConstThermo<equationOfState> >
+    return autoPtr<eConstThermo<EquationOfState> >
     (
-        new eConstThermo<equationOfState>(is)
+        new eConstThermo<EquationOfState>(is)
+    );
+}
+
+
+template<class EquationOfState>
+inline Foam::autoPtr<Foam::eConstThermo<EquationOfState> >
+Foam::eConstThermo<EquationOfState>::New(const dictionary& dict)
+{
+    return autoPtr<eConstThermo<EquationOfState> >
+    (
+        new eConstThermo<EquationOfState>(dict)
     );
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class equationOfState>
-inline Foam::scalar Foam::eConstThermo<equationOfState>::cp
+template<class EquationOfState>
+inline Foam::scalar Foam::eConstThermo<EquationOfState>::cp
 (
     const scalar
 ) const
@@ -88,8 +99,8 @@ inline Foam::scalar Foam::eConstThermo<equationOfState>::cp
 }
 
 
-template<class equationOfState>
-inline Foam::scalar Foam::eConstThermo<equationOfState>::h
+template<class EquationOfState>
+inline Foam::scalar Foam::eConstThermo<EquationOfState>::h
 (
     const scalar T
 ) const
@@ -98,8 +109,8 @@ inline Foam::scalar Foam::eConstThermo<equationOfState>::h
 }
 
 
-template<class equationOfState>
-inline Foam::scalar Foam::eConstThermo<equationOfState>::hs
+template<class EquationOfState>
+inline Foam::scalar Foam::eConstThermo<EquationOfState>::hs
 (
     const scalar T
 ) const
@@ -108,35 +119,38 @@ inline Foam::scalar Foam::eConstThermo<equationOfState>::hs
 }
 
 
-template<class equationOfState>
-inline Foam::scalar Foam::eConstThermo<equationOfState>::hc() const
+template<class EquationOfState>
+inline Foam::scalar Foam::eConstThermo<EquationOfState>::hc() const
 {
     return Hf_*this->W();
 }
 
 
-template<class equationOfState>
-inline Foam::scalar Foam::eConstThermo<equationOfState>::s
+template<class EquationOfState>
+inline Foam::scalar Foam::eConstThermo<EquationOfState>::s
 (
     const scalar T
 ) const
 {
-    notImplemented("scalar eConstThermo::s(const scalar T) const");
+    notImplemented
+    (
+        "scalar eConstThermo<EquationOfState>::s(const scalar) const"
+    );
     return T;
 }
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class equationOfState>
-inline void Foam::eConstThermo<equationOfState>::operator+=
+template<class EquationOfState>
+inline void Foam::eConstThermo<EquationOfState>::operator+=
 (
-    const eConstThermo<equationOfState>& ct
+    const eConstThermo<EquationOfState>& ct
 )
 {
     scalar molr1 = this->nMoles();
 
-    equationOfState::operator+=(ct);
+    EquationOfState::operator+=(ct);
 
     molr1 /= this->nMoles();
     scalar molr2 = ct.nMoles()/this->nMoles();
@@ -146,15 +160,15 @@ inline void Foam::eConstThermo<equationOfState>::operator+=
 }
 
 
-template<class equationOfState>
-inline void Foam::eConstThermo<equationOfState>::operator-=
+template<class EquationOfState>
+inline void Foam::eConstThermo<EquationOfState>::operator-=
 (
-    const eConstThermo<equationOfState>& ct
+    const eConstThermo<EquationOfState>& ct
 )
 {
     scalar molr1 = this->nMoles();
 
-    equationOfState::operator-=(ct);
+    EquationOfState::operator-=(ct);
 
     molr1 /= this->nMoles();
     scalar molr2 = ct.nMoles()/this->nMoles();
@@ -166,20 +180,20 @@ inline void Foam::eConstThermo<equationOfState>::operator-=
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-template<class equationOfState>
-inline Foam::eConstThermo<equationOfState> Foam::operator+
+template<class EquationOfState>
+inline Foam::eConstThermo<EquationOfState> Foam::operator+
 (
-    const eConstThermo<equationOfState>& ct1,
-    const eConstThermo<equationOfState>& ct2
+    const eConstThermo<EquationOfState>& ct1,
+    const eConstThermo<EquationOfState>& ct2
 )
 {
-    equationOfState eofs
+    EquationOfState eofs
     (
-        static_cast<const equationOfState&>(ct1)
-      + static_cast<const equationOfState&>(ct2)
+        static_cast<const EquationOfState&>(ct1)
+      + static_cast<const EquationOfState&>(ct2)
     );
 
-    return eConstThermo<equationOfState>
+    return eConstThermo<EquationOfState>
     (
         eofs,
         ct1.nMoles()/eofs.nMoles()*ct1.Cv_
@@ -190,20 +204,20 @@ inline Foam::eConstThermo<equationOfState> Foam::operator+
 }
 
 
-template<class equationOfState>
-inline Foam::eConstThermo<equationOfState> Foam::operator-
+template<class EquationOfState>
+inline Foam::eConstThermo<EquationOfState> Foam::operator-
 (
-    const eConstThermo<equationOfState>& ct1,
-    const eConstThermo<equationOfState>& ct2
+    const eConstThermo<EquationOfState>& ct1,
+    const eConstThermo<EquationOfState>& ct2
 )
 {
-    equationOfState eofs
+    EquationOfState eofs
     (
-        static_cast<const equationOfState&>(ct1)
-      - static_cast<const equationOfState&>(ct2)
+        static_cast<const EquationOfState&>(ct1)
+      - static_cast<const EquationOfState&>(ct2)
     );
 
-    return eConstThermo<equationOfState>
+    return eConstThermo<EquationOfState>
     (
         eofs,
         ct1.nMoles()/eofs.nMoles()*ct1.Cv_
@@ -214,27 +228,27 @@ inline Foam::eConstThermo<equationOfState> Foam::operator-
 }
 
 
-template<class equationOfState>
-inline Foam::eConstThermo<equationOfState> Foam::operator*
+template<class EquationOfState>
+inline Foam::eConstThermo<EquationOfState> Foam::operator*
 (
     const scalar s,
-    const eConstThermo<equationOfState>& ct
+    const eConstThermo<EquationOfState>& ct
 )
 {
-    return eConstThermo<equationOfState>
+    return eConstThermo<EquationOfState>
     (
-        s*static_cast<const equationOfState&>(ct),
+        s*static_cast<const EquationOfState&>(ct),
         ct.Cv_,
         ct.Hf_
     );
 }
 
 
-template<class equationOfState>
-inline Foam::eConstThermo<equationOfState> Foam::operator==
+template<class EquationOfState>
+inline Foam::eConstThermo<EquationOfState> Foam::operator==
 (
-    const eConstThermo<equationOfState>& ct1,
-    const eConstThermo<equationOfState>& ct2
+    const eConstThermo<EquationOfState>& ct1,
+    const eConstThermo<EquationOfState>& ct2
 )
 {
     return ct2 - ct1;
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
index 7c4e8216a9..250d355770 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
@@ -39,6 +39,26 @@ Foam::hConstThermo<equationOfState>::hConstThermo(Istream& is)
 }
 
 
+template<class equationOfState>
+Foam::hConstThermo<equationOfState>::hConstThermo(const dictionary& dict)
+:
+    equationOfState(dict),
+    Cp_(readScalar(dict.lookup("Cp"))),
+    Hf_(readScalar(dict.lookup("Hf")))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+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;
+}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 template<class equationOfState>
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
index d1acddd2c2..237822a52d 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
@@ -115,6 +115,9 @@ public:
         //- Construct from Istream
         hConstThermo(Istream&);
 
+        //- Construct from dictionary
+        hConstThermo(const dictionary& dict);
+
         //- Construct as named copy
         inline hConstThermo(const word&, const hConstThermo&);
 
@@ -124,10 +127,13 @@ public:
         //- Selector from Istream
         inline static autoPtr<hConstThermo> New(Istream& is);
 
+        //- Selector from dictionary
+        inline static autoPtr<hConstThermo> New(const dictionary& dict);
+
 
     // Member Functions
 
-        // Fundamaental properties
+        // Fundamental properties
 
             //- Heat capacity at constant pressure [J/(kmol K)]
             inline scalar cp(const scalar T) const;
@@ -145,6 +151,12 @@ public:
             inline scalar s(const scalar T) const;
 
 
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
+
+
     // Member operators
 
         inline void operator+=(const hConstThermo&);
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
index 3c596cc3f9..180201e57c 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
@@ -76,6 +76,17 @@ Foam::hConstThermo<equationOfState>::New(Istream& is)
 }
 
 
+template<class equationOfState>
+inline Foam::autoPtr<Foam::hConstThermo<equationOfState> >
+Foam::hConstThermo<equationOfState>::New(const dictionary& dict)
+{
+    return autoPtr<hConstThermo<equationOfState> >
+    (
+        new hConstThermo<equationOfState>(dict)
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class equationOfState>
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index 610b1192c2..1b04a9d47c 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -37,22 +37,66 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
     EquationOfState(is),
     Hf_(readScalar(is)),
     Sf_(readScalar(is)),
-    cpPolynomial_("cpPolynomial", is),
-    hPolynomial_(),
-    sPolynomial_()
+    CpCoeffs_("CpCoeffs<" + Foam::name(PolySize) + '>', is),
+    hCoeffs_(),
+    sCoeffs_()
 {
     Hf_ *= this->W();
     Sf_ *= this->W();
-    cpPolynomial_ *= this->W();
+    CpCoeffs_ *= this->W();
 
-    hPolynomial_ = cpPolynomial_.integrate();
-    sPolynomial_ = cpPolynomial_.integrateMinus1();
+    hCoeffs_ = CpCoeffs_.integrate();
+    sCoeffs_ = CpCoeffs_.integrateMinus1();
 
     // Offset h poly so that it is relative to the enthalpy at Tstd
-    hPolynomial_[0] += Hf_ - hPolynomial_.evaluate(specie::Tstd);
+    hCoeffs_[0] += Hf_ - hCoeffs_.evaluate(specie::Tstd);
 
     // Offset s poly so that it is relative to the entropy at Tstd
-    sPolynomial_[0] += Sf_ - sPolynomial_.evaluate(specie::Tstd);
+    sCoeffs_[0] += Sf_ - sCoeffs_.evaluate(specie::Tstd);
+}
+
+
+template<class EquationOfState, int PolySize>
+Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
+(
+    const dictionary& dict
+)
+:
+    EquationOfState(dict),
+    Hf_(readScalar(dict.lookup("Hf"))),
+    Sf_(readScalar(dict.lookup("Sf"))),
+    CpCoeffs_(dict.lookup("CpCoeffs<" + Foam::name(PolySize) + '>')),
+    hCoeffs_(),
+    sCoeffs_()
+{
+    Hf_ *= this->W();
+    Sf_ *= this->W();
+    CpCoeffs_ *= this->W();
+
+    hCoeffs_ = CpCoeffs_.integrate();
+    sCoeffs_ = CpCoeffs_.integrateMinus1();
+
+    // Offset h poly so that it is relative to the enthalpy at Tstd
+    hCoeffs_[0] += Hf_ - hCoeffs_.evaluate(specie::Tstd);
+
+    // Offset s poly so that it is relative to the entropy at Tstd
+    sCoeffs_[0] += Sf_ - sCoeffs_.evaluate(specie::Tstd);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class EquationOfState, int PolySize>
+void Foam::hPolynomialThermo<EquationOfState, PolySize>::write
+(
+    Ostream& os
+) const
+{
+    EquationOfState::write(os);
+    os.writeKeyword("Hf") << Hf_/this->W() << token::END_STATEMENT << nl;
+    os.writeKeyword("Sf") << Sf_/this->W() << token::END_STATEMENT << nl;
+    os.writeKeyword(word("CpCoeffs<" + Foam::name(PolySize) + '>'))
+        << CpCoeffs_/this->W() << token::END_STATEMENT << nl;
 }
 
 
@@ -67,8 +111,9 @@ Foam::Ostream& Foam::operator<<
 {
     os  << static_cast<const EquationOfState&>(pt) << tab
         << pt.Hf_/pt.W() << tab
-        << pt.Sf_ << tab
-        << "cpPolynomial" << tab << pt.cpPolynomial_/pt.W();
+        << pt.Sf_/pt.W() << tab
+        << "CpCoeffs<" << Foam::name(PolySize) << '>' << tab
+        << pt.CpCoeffs_/pt.W();
 
     os.check
     (
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
index 587714496b..557aebb877 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
@@ -107,14 +107,15 @@ class hPolynomialThermo
         //  Note: input in [J/kg/K], but internally uses [J/kmol/K]
         scalar Sf_;
 
-        //- Specific heat at constant pressure [J/(kg.K)]
-        Polynomial<PolySize> cpPolynomial_;
+        //- Specific heat at constant pressure polynomial coeffs [J/(kg.K)]
+        Polynomial<PolySize> CpCoeffs_;
 
-        //- Enthalpy - derived from cp [J/kg] - relative to Tstd
-        typename Polynomial<PolySize>::intPolyType hPolynomial_;
+        //- Enthalpy polynomial coeffs - derived from cp [J/kg]
+        //  NOTE: relative to Tstd
+        typename Polynomial<PolySize>::intPolyType hCoeffs_;
 
-        //- Entropy - derived from cp [J/(kg.K)] - relative to Tstd
-        Polynomial<PolySize> sPolynomial_;
+        //- Entropy - derived from Cp [J/(kg.K)] - relative to Tstd
+        Polynomial<PolySize> sCoeffs_;
 
 
     // Private Member Functions
@@ -125,9 +126,9 @@ class hPolynomialThermo
             const EquationOfState& pt,
             const scalar Hf,
             const scalar Sf,
-            const Polynomial<PolySize>& cpPoly,
-            const typename Polynomial<PolySize>::intPolyType& hPoly,
-            const Polynomial<PolySize>& sPoly
+            const Polynomial<PolySize>& CpCoeffs,
+            const typename Polynomial<PolySize>::intPolyType& hCoeffs,
+            const Polynomial<PolySize>& sCoeffs
         );
 
 
@@ -135,9 +136,12 @@ public:
 
     // Constructors
 
-        //- Construct from dictionary
+        //- Construct from Istream
         hPolynomialThermo(Istream& is);
 
+        //- Construct from dictionary
+        hPolynomialThermo(const dictionary& dict);
+
         //- Construct as copy
         inline hPolynomialThermo(const hPolynomialThermo&);
 
@@ -147,20 +151,28 @@ public:
 
     // Member Functions
 
-        //- Heat capacity at constant pressure [J/(kmol K)]
-        inline scalar cp(const scalar T) const;
+        // Fundamental properties
 
-        //- Enthalpy [J/kmol]
-        inline scalar h(const scalar T) const;
+            //- Heat capacity at constant pressure [J/(kmol K)]
+            inline scalar cp(const scalar T) const;
 
-        //- Sensible enthalpy [J/kmol]
-        inline scalar hs(const scalar T) const;
+            //- Enthalpy [J/kmol]
+            inline scalar h(const scalar T) const;
 
-        //- Chemical enthalpy [J/kmol]
-        inline scalar hc() const;
+            //- Sensible enthalpy [J/kmol]
+            inline scalar hs(const scalar T) const;
 
-        //- Entropy [J/(kmol K)]
-        inline scalar s(const scalar T) const;
+            //- Chemical enthalpy [J/kmol]
+            inline scalar hc() const;
+
+            //- Entropy [J/(kmol K)]
+            inline scalar s(const scalar T) const;
+
+
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
 
 
     // Member operators
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
index b16ed5d0a6..1576c646d0 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
@@ -33,17 +33,17 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
     const EquationOfState& pt,
     const scalar Hf,
     const scalar Sf,
-    const Polynomial<PolySize>& cpPoly,
-    const typename Polynomial<PolySize>::intPolyType& hPoly,
-    const Polynomial<PolySize>& sPoly
+    const Polynomial<PolySize>& CpCoeffs,
+    const typename Polynomial<PolySize>::intPolyType& hCoeffs,
+    const Polynomial<PolySize>& sCoeffs
 )
 :
     EquationOfState(pt),
     Hf_(Hf),
     Sf_(Sf),
-    cpPolynomial_(cpPoly),
-    hPolynomial_(hPoly),
-    sPolynomial_(sPoly)
+    CpCoeffs_(CpCoeffs),
+    hCoeffs_(hCoeffs),
+    sCoeffs_(sCoeffs)
 {}
 
 
@@ -58,9 +58,9 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
     EquationOfState(pt),
     Hf_(pt.Hf_),
     Sf_(pt.Sf_),
-    cpPolynomial_(pt.cpPolynomial_),
-    hPolynomial_(pt.hPolynomial_),
-    sPolynomial_(pt.sPolynomial_)
+    CpCoeffs_(pt.CpCoeffs_),
+    hCoeffs_(pt.hCoeffs_),
+    sCoeffs_(pt.sCoeffs_)
 {}
 
 
@@ -74,9 +74,9 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
     EquationOfState(name, pt),
     Hf_(pt.Hf_),
     Sf_(pt.Sf_),
-    cpPolynomial_(pt.cpPolynomial_),
-    hPolynomial_(pt.hPolynomial_),
-    sPolynomial_(pt.sPolynomial_)
+    CpCoeffs_(pt.CpCoeffs_),
+    hCoeffs_(pt.hCoeffs_),
+    sCoeffs_(pt.sCoeffs_)
 {}
 
 
@@ -88,7 +88,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::cp
     const scalar T
 ) const
 {
-    return cpPolynomial_.evaluate(T);
+    return CpCoeffs_.evaluate(T);
 }
 
 
@@ -98,7 +98,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::h
     const scalar T
 ) const
 {
-    return hPolynomial_.evaluate(T);
+    return hCoeffs_.evaluate(T);
 }
 
 
@@ -126,7 +126,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::s
     const scalar T
 ) const
 {
-    return sPolynomial_.evaluate(T);
+    return sCoeffs_.evaluate(T);
 }
 
 
@@ -143,9 +143,9 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::operator=
 
     Hf_ = pt.Hf_;
     Sf_ = pt.Sf_;
-    cpPolynomial_ = pt.cpPolynomial_;
-    hPolynomial_ = pt.hPolynomial_;
-    sPolynomial_ = pt.sPolynomial_;
+    CpCoeffs_ = pt.CpCoeffs_;
+    hCoeffs_ = pt.hCoeffs_;
+    sCoeffs_ = pt.sCoeffs_;
 
     return *this;
 }
@@ -166,9 +166,9 @@ inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator+=
 
     Hf_ = molr1*Hf_ + molr2*pt.Hf_;
     Sf_ = molr1*Sf_ + molr2*pt.Sf_;
-    cpPolynomial_ = molr1*cpPolynomial_ + molr2*pt.cpPolynomial_;
-    hPolynomial_ = molr1*hPolynomial_ + molr2*pt.hPolynomial_;
-    sPolynomial_ = molr1*sPolynomial_ + molr2*pt.sPolynomial_;
+    CpCoeffs_ = molr1*CpCoeffs_ + molr2*pt.CpCoeffs_;
+    hCoeffs_ = molr1*hCoeffs_ + molr2*pt.hCoeffs_;
+    sCoeffs_ = molr1*sCoeffs_ + molr2*pt.sCoeffs_;
 }
 
 
@@ -187,9 +187,9 @@ inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator-=
 
     Hf_ = molr1*Hf_ - molr2*pt.Hf_;
     Sf_ = molr1*Sf_ - molr2*pt.Sf_;
-    cpPolynomial_ = molr1*cpPolynomial_ - molr2*pt.cpPolynomial_;
-    hPolynomial_ = molr1*hPolynomial_ - molr2*pt.hPolynomial_;
-    sPolynomial_ = molr1*sPolynomial_ - molr2*pt.sPolynomial_;
+    CpCoeffs_ = molr1*CpCoeffs_ - molr2*pt.CpCoeffs_;
+    hCoeffs_ = molr1*hCoeffs_ - molr2*pt.hCoeffs_;
+    sCoeffs_ = molr1*sCoeffs_ - molr2*pt.sCoeffs_;
 }
 
 
@@ -223,9 +223,9 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator+
         eofs,
         molr1*pt1.Hf_ + molr2*pt2.Hf_,
         molr1*pt1.Sf_ + molr2*pt2.Sf_,
-        molr1*pt1.cpPolynomial_ + molr2*pt2.cpPolynomial_,
-        molr1*pt1.hPolynomial_ + molr2*pt2.hPolynomial_,
-        molr1*pt1.sPolynomial_ + molr2*pt2.sPolynomial_
+        molr1*pt1.CpCoeffs_ + molr2*pt2.CpCoeffs_,
+        molr1*pt1.hCoeffs_ + molr2*pt2.hCoeffs_,
+        molr1*pt1.sCoeffs_ + molr2*pt2.sCoeffs_
     );
 }
 
@@ -248,9 +248,9 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator-
         eofs,
         molr1*pt1.Hf_ - molr2*pt2.Hf_,
         molr1*pt1.Sf_ - molr2*pt2.Sf_,
-        molr1*pt1.cpPolynomial_ - molr2*pt2.cpPolynomial_,
-        molr1*pt1.hPolynomial_ - molr2*pt2.hPolynomial_,
-        molr1*pt1.sPolynomial_ - molr2*pt2.sPolynomial_
+        molr1*pt1.CpCoeffs_ - molr2*pt2.CpCoeffs_,
+        molr1*pt1.hCoeffs_ - molr2*pt2.hCoeffs_,
+        molr1*pt1.sCoeffs_ - molr2*pt2.sCoeffs_
     );
 }
 
@@ -267,9 +267,9 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator*
         s*static_cast<const EquationOfState&>(pt),
         pt.Hf_,
         pt.Sf_,
-        pt.cpPolynomial_,
-        pt.hPolynomial_,
-        pt.sPolynomial_
+        pt.CpCoeffs_,
+        pt.hCoeffs_,
+        pt.sCoeffs_
     );
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
index c635de1b6b..562f373df7 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
@@ -26,64 +26,54 @@ License
 #include "janafThermo.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class equationOfState>
-Foam::janafThermo<equationOfState>::janafThermo(Istream& is)
-:
-    equationOfState(is),
-    Tlow_(readScalar(is)),
-    Thigh_(readScalar(is)),
-    Tcommon_(readScalar(is))
+template<class EquationOfState>
+void Foam::janafThermo<EquationOfState>::checkInputData() const
 {
     if (Tlow_ >= Thigh_)
     {
-        FatalIOErrorIn
-        (
-            "janafThermo<equationOfState>::janafThermo(Istream& is)",
-            is
-        )   << "Tlow(" << Tlow_ << ") >= Thigh(" << Thigh_ << ')'
+        FatalErrorIn("janafThermo<EquationOfState>::check()")
+            << "Tlow(" << Tlow_ << ") >= Thigh(" << Thigh_ << ')'
             << exit(FatalIOError);
     }
 
     if (Tcommon_ <= Tlow_)
     {
-        FatalIOErrorIn
-        (
-            "janafThermo<equationOfState>::janafThermo(Istream& is)",
-            is
-        )   << "Tcommon(" << Tcommon_ << ") <= Tlow(" << Tlow_ << ')'
+        FatalErrorIn("janafThermo<EquationOfState>::check()")
+            << "Tcommon(" << Tcommon_ << ") <= Tlow(" << Tlow_ << ')'
             << exit(FatalIOError);
     }
 
     if (Tcommon_ > Thigh_)
     {
-        FatalIOErrorIn
-        (
-            "janafThermo<equationOfState>::janafThermo(Istream& is)",
-            is
-        )   << "Tcommon(" << Tcommon_ << ") > Thigh(" << Thigh_ << ')'
+        FatalErrorIn("janafThermo<EquationOfState>::check()")
+            << "Tcommon(" << Tcommon_ << ") > Thigh(" << Thigh_ << ')'
             << exit(FatalIOError);
     }
+}
 
-    for
-    (
-        register label coefLabel=0;
-        coefLabel<janafThermo<equationOfState>::nCoeffs_;
-        coefLabel++
-    )
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class EquationOfState>
+Foam::janafThermo<EquationOfState>::janafThermo(Istream& is)
+:
+    EquationOfState(is),
+    Tlow_(readScalar(is)),
+    Thigh_(readScalar(is)),
+    Tcommon_(readScalar(is))
+{
+    checkInputData();
+
+    forAll(highCpCoeffs_, i)
     {
-        is >> highCpCoeffs_[coefLabel];
+        is >> highCpCoeffs_[i];
     }
 
-    for
-    (
-        register label coefLabel=0;
-        coefLabel<janafThermo<equationOfState>::nCoeffs_;
-        coefLabel++
-    )
+    forAll(lowCpCoeffs_, i)
     {
-        is >> lowCpCoeffs_[coefLabel];
+        is >> lowCpCoeffs_[i];
     }
 
     // Check state of Istream
@@ -91,49 +81,69 @@ Foam::janafThermo<equationOfState>::janafThermo(Istream& is)
 }
 
 
+template<class EquationOfState>
+Foam::janafThermo<EquationOfState>::janafThermo(const dictionary& dict)
+:
+    EquationOfState(dict),
+    Tlow_(readScalar(dict.lookup("Tlow"))),
+    Thigh_(readScalar(dict.lookup("Thigh"))),
+    Tcommon_(readScalar(dict.lookup("Tcommon"))),
+    highCpCoeffs_(dict.lookup("highCpCoeffs")),
+    lowCpCoeffs_(dict.lookup("lowCpCoeffs"))
+{
+    checkInputData();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+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;
+    os.writeKeyword("Tcommon") << Tcommon_ << token::END_STATEMENT << endl;
+    os.writeKeyword("highCpCoeffs") << highCpCoeffs_ << token::END_STATEMENT
+        << endl;
+    os.writeKeyword("lowCpCoeffs") << lowCpCoeffs_ << token::END_STATEMENT
+        << endl;
+}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-template<class equationOfState>
+template<class EquationOfState>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const janafThermo<equationOfState>& jt
+    const janafThermo<EquationOfState>& jt
 )
 {
-    os  << static_cast<const equationOfState&>(jt) << nl
+    os  << static_cast<const EquationOfState&>(jt) << nl
         << "    " << jt.Tlow_
         << tab << jt.Thigh_
         << tab << jt.Tcommon_;
 
     os << nl << "    ";
 
-    for
-    (
-        register label coefLabel=0;
-        coefLabel<janafThermo<equationOfState>::nCoeffs_;
-        coefLabel++
-    )
+    forAll(jt.highCpCoeffs_, i)
     {
-        os << jt.highCpCoeffs_[coefLabel] << ' ';
+        os << jt.highCpCoeffs_[i] << ' ';
     }
 
     os << nl << "    ";
 
-    for
-    (
-        register label coefLabel=0;
-        coefLabel<janafThermo<equationOfState>::nCoeffs_;
-        coefLabel++
-    )
+    forAll(jt.lowCpCoeffs_, i)
     {
-        os << jt.lowCpCoeffs_[coefLabel] << ' ';
+        os << jt.lowCpCoeffs_[i] << ' ';
     }
 
     os << endl;
 
     os.check
     (
-        "operator<<(Ostream& os, const janafThermo<equationOfState>& jt)"
+        "operator<<(Ostream& os, const janafThermo<EquationOfState>& jt)"
     );
 
     return os;
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
index 3103671272..c60c898163 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
@@ -26,7 +26,7 @@ Class
 
 Description
     JANAF tables based thermodynamics package templated
-    into the equationOfState.
+    into the equation of state.
 
 SourceFiles
     janafThermoI.H
@@ -38,6 +38,7 @@ SourceFiles
 #define janafThermo_H
 
 #include "scalar.H"
+#include "FixedList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,41 +47,41 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-template<class equationOfState> class janafThermo;
+template<class EquationOfState> class janafThermo;
 
-template<class equationOfState>
-inline janafThermo<equationOfState> operator+
+template<class EquationOfState>
+inline janafThermo<EquationOfState> operator+
 (
-    const janafThermo<equationOfState>&,
-    const janafThermo<equationOfState>&
+    const janafThermo<EquationOfState>&,
+    const janafThermo<EquationOfState>&
 );
 
-template<class equationOfState>
-inline janafThermo<equationOfState> operator-
+template<class EquationOfState>
+inline janafThermo<EquationOfState> operator-
 (
-    const janafThermo<equationOfState>&,
-    const janafThermo<equationOfState>&
+    const janafThermo<EquationOfState>&,
+    const janafThermo<EquationOfState>&
 );
 
-template<class equationOfState>
-inline janafThermo<equationOfState> operator*
+template<class EquationOfState>
+inline janafThermo<EquationOfState> operator*
 (
     const scalar,
-    const janafThermo<equationOfState>&
+    const janafThermo<EquationOfState>&
 );
 
-template<class equationOfState>
-inline janafThermo<equationOfState> operator==
+template<class EquationOfState>
+inline janafThermo<EquationOfState> operator==
 (
-    const janafThermo<equationOfState>&,
-    const janafThermo<equationOfState>&
+    const janafThermo<EquationOfState>&,
+    const janafThermo<EquationOfState>&
 );
 
-template<class equationOfState>
+template<class EquationOfState>
 Ostream& operator<<
 (
     Ostream&,
-    const janafThermo<equationOfState>&
+    const janafThermo<EquationOfState>&
 );
 
 
@@ -88,16 +89,19 @@ Ostream& operator<<
                            Class janafThermo Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class equationOfState>
+template<class EquationOfState>
 class janafThermo
 :
-    public equationOfState
+    public EquationOfState
 {
 
 public:
 
+    // Public data
+
         static const int nCoeffs_ = 7;
-        typedef scalar coeffArray[7];
+        typedef FixedList<scalar, nCoeffs_> coeffArray;
+
 
 private:
 
@@ -112,6 +116,9 @@ private:
 
     // Private Member Functions
 
+        //- Check that input data is valid
+        void checkInputData() const;
+
         //- Check given temperature is within the range of the fitted coeffs
         inline void checkT(const scalar T) const;
 
@@ -126,7 +133,7 @@ public:
         //- Construct from components
         inline janafThermo
         (
-            const equationOfState& st,
+            const EquationOfState& st,
             const scalar Tlow,
             const scalar Thigh,
             const scalar Tcommon,
@@ -137,26 +144,37 @@ public:
         //- Construct from Istream
         janafThermo(Istream&);
 
+        //- Construct from dictionary
+        janafThermo(const dictionary& dict);
+
         //- Construct as a named copy
         inline janafThermo(const word&, const janafThermo&);
 
 
     // Member Functions
 
-        //- Heat capacity at constant pressure [J/(kmol K)]
-        inline scalar cp(const scalar T) const;
+        // Fundamental properties
 
-        //- Enthalpy [J/kmol]
-        inline scalar h(const scalar T) const;
+            //- Heat capacity at constant pressure [J/(kmol K)]
+            inline scalar cp(const scalar T) const;
 
-        //- Sensible enthalpy [J/kmol]
-        inline scalar hs(const scalar T) const;
+            //- Enthalpy [J/kmol]
+            inline scalar h(const scalar T) const;
 
-        //- Chemical enthalpy [J/kmol]
-        inline scalar hc() const;
+            //- Sensible enthalpy [J/kmol]
+            inline scalar hs(const scalar T) const;
 
-        //- Entropy [J/(kmol K)]
-        inline scalar s(const scalar T) const;
+            //- Chemical enthalpy [J/kmol]
+            inline scalar hc() const;
+
+            //- Entropy [J/(kmol K)]
+            inline scalar s(const scalar T) const;
+
+
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
 
 
     // Member operators
@@ -167,25 +185,25 @@ public:
 
     // Friend operators
 
-        friend janafThermo operator+ <equationOfState>
+        friend janafThermo operator+ <EquationOfState>
         (
             const janafThermo&,
             const janafThermo&
         );
 
-        friend janafThermo operator- <equationOfState>
+        friend janafThermo operator- <EquationOfState>
         (
             const janafThermo&,
             const janafThermo&
         );
 
-        friend janafThermo operator* <equationOfState>
+        friend janafThermo operator* <EquationOfState>
         (
             const scalar,
             const janafThermo&
         );
 
-        friend janafThermo operator== <equationOfState>
+        friend janafThermo operator== <EquationOfState>
         (
             const janafThermo&,
             const janafThermo&
@@ -194,7 +212,7 @@ public:
 
     // Ostream Operator
 
-        friend Ostream& operator<< <equationOfState>
+        friend Ostream& operator<< <EquationOfState>
         (
             Ostream&,
             const janafThermo&
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
index 1379a9d8ad..05f3a1b981 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
@@ -28,18 +28,18 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class equationOfState>
-inline Foam::janafThermo<equationOfState>::janafThermo
+template<class EquationOfState>
+inline Foam::janafThermo<EquationOfState>::janafThermo
 (
-    const equationOfState& st,
+    const EquationOfState& st,
     const scalar Tlow,
     const scalar Thigh,
     const scalar Tcommon,
-    const typename janafThermo<equationOfState>::coeffArray& highCpCoeffs,
-    const typename janafThermo<equationOfState>::coeffArray& lowCpCoeffs
+    const typename janafThermo<EquationOfState>::coeffArray& highCpCoeffs,
+    const typename janafThermo<EquationOfState>::coeffArray& lowCpCoeffs
 )
 :
-    equationOfState(st),
+    EquationOfState(st),
     Tlow_(Tlow),
     Thigh_(Thigh),
     Tcommon_(Tcommon)
@@ -52,15 +52,15 @@ inline Foam::janafThermo<equationOfState>::janafThermo
 }
 
 
-template<class equationOfState>
-inline void Foam::janafThermo<equationOfState>::checkT(const scalar T) const
+template<class EquationOfState>
+inline void Foam::janafThermo<EquationOfState>::checkT(const scalar T) const
 {
     if (T < Tlow_ || T > Thigh_)
     {
         FatalErrorIn
         (
-            "janafThermo<equationOfState>::checkT(const scalar T) const"
-        )   << "attempt to use janafThermo<equationOfState>"
+            "janafThermo<EquationOfState>::checkT(const scalar T) const"
+        )   << "attempt to use janafThermo<EquationOfState>"
                " out of temperature range "
             << Tlow_ << " -> " << Thigh_ << ";  T = " << T
             << abort(FatalError);
@@ -68,9 +68,9 @@ inline void Foam::janafThermo<equationOfState>::checkT(const scalar T) const
 }
 
 
-template<class equationOfState>
-inline const typename Foam::janafThermo<equationOfState>::coeffArray&
-Foam::janafThermo<equationOfState>::coeffs
+template<class EquationOfState>
+inline const typename Foam::janafThermo<EquationOfState>::coeffArray&
+Foam::janafThermo<EquationOfState>::coeffs
 (
     const scalar T
 ) const
@@ -90,14 +90,14 @@ Foam::janafThermo<equationOfState>::coeffs
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class equationOfState>
-inline Foam::janafThermo<equationOfState>::janafThermo
+template<class EquationOfState>
+inline Foam::janafThermo<EquationOfState>::janafThermo
 (
     const word& name,
     const janafThermo& jt
 )
 :
-    equationOfState(name, jt),
+    EquationOfState(name, jt),
     Tlow_(jt.Tlow_),
     Thigh_(jt.Thigh_),
     Tcommon_(jt.Tcommon_)
@@ -112,8 +112,8 @@ inline Foam::janafThermo<equationOfState>::janafThermo
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class equationOfState>
-inline Foam::scalar Foam::janafThermo<equationOfState>::cp
+template<class EquationOfState>
+inline Foam::scalar Foam::janafThermo<EquationOfState>::cp
 (
     const scalar T
 ) const
@@ -123,8 +123,8 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::cp
 }
 
 
-template<class equationOfState>
-inline Foam::scalar Foam::janafThermo<equationOfState>::h
+template<class EquationOfState>
+inline Foam::scalar Foam::janafThermo<EquationOfState>::h
 (
     const scalar T
 ) const
@@ -138,8 +138,8 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::h
 }
 
 
-template<class equationOfState>
-inline Foam::scalar Foam::janafThermo<equationOfState>::hs
+template<class EquationOfState>
+inline Foam::scalar Foam::janafThermo<EquationOfState>::hs
 (
     const scalar T
 ) const
@@ -148,8 +148,8 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::hs
 }
 
 
-template<class equationOfState>
-inline Foam::scalar Foam::janafThermo<equationOfState>::hc() const
+template<class EquationOfState>
+inline Foam::scalar Foam::janafThermo<EquationOfState>::hc() const
 {
     const coeffArray& a = lowCpCoeffs_;
     const scalar Tstd = specie::Tstd;
@@ -163,8 +163,8 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::hc() const
 }
 
 
-template<class equationOfState>
-inline Foam::scalar Foam::janafThermo<equationOfState>::s
+template<class EquationOfState>
+inline Foam::scalar Foam::janafThermo<EquationOfState>::s
 (
     const scalar T
 ) const
@@ -181,15 +181,15 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::s
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class equationOfState>
-inline void Foam::janafThermo<equationOfState>::operator+=
+template<class EquationOfState>
+inline void Foam::janafThermo<EquationOfState>::operator+=
 (
-    const janafThermo<equationOfState>& jt
+    const janafThermo<EquationOfState>& jt
 )
 {
     scalar molr1 = this->nMoles();
 
-    equationOfState::operator+=(jt);
+    EquationOfState::operator+=(jt);
 
     molr1 /= this->nMoles();
     scalar molr2 = jt.nMoles()/this->nMoles();
@@ -201,7 +201,7 @@ inline void Foam::janafThermo<equationOfState>::operator+=
     for
     (
         register label coefLabel=0;
-        coefLabel<janafThermo<equationOfState>::nCoeffs_;
+        coefLabel<janafThermo<EquationOfState>::nCoeffs_;
         coefLabel++
     )
     {
@@ -216,15 +216,15 @@ inline void Foam::janafThermo<equationOfState>::operator+=
 }
 
 
-template<class equationOfState>
-inline void Foam::janafThermo<equationOfState>::operator-=
+template<class EquationOfState>
+inline void Foam::janafThermo<EquationOfState>::operator-=
 (
-    const janafThermo<equationOfState>& jt
+    const janafThermo<EquationOfState>& jt
 )
 {
     scalar molr1 = this->nMoles();
 
-    equationOfState::operator-=(jt);
+    EquationOfState::operator-=(jt);
 
     molr1 /= this->nMoles();
     scalar molr2 = jt.nMoles()/this->nMoles();
@@ -236,7 +236,7 @@ inline void Foam::janafThermo<equationOfState>::operator-=
     for
     (
         register label coefLabel=0;
-        coefLabel<janafThermo<equationOfState>::nCoeffs_;
+        coefLabel<janafThermo<EquationOfState>::nCoeffs_;
         coefLabel++
     )
     {
@@ -253,26 +253,26 @@ inline void Foam::janafThermo<equationOfState>::operator-=
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-template<class equationOfState>
-inline Foam::janafThermo<equationOfState> Foam::operator+
+template<class EquationOfState>
+inline Foam::janafThermo<EquationOfState> Foam::operator+
 (
-    const janafThermo<equationOfState>& jt1,
-    const janafThermo<equationOfState>& jt2
+    const janafThermo<EquationOfState>& jt1,
+    const janafThermo<EquationOfState>& jt2
 )
 {
-    equationOfState eofs = jt1;
+    EquationOfState eofs = jt1;
     eofs += jt2;
 
     scalar molr1 = jt1.nMoles()/eofs.nMoles();
     scalar molr2 = jt2.nMoles()/eofs.nMoles();
 
-    typename janafThermo<equationOfState>::coeffArray highCpCoeffs;
-    typename janafThermo<equationOfState>::coeffArray lowCpCoeffs;
+    typename janafThermo<EquationOfState>::coeffArray highCpCoeffs;
+    typename janafThermo<EquationOfState>::coeffArray lowCpCoeffs;
 
     for
     (
         register label coefLabel=0;
-        coefLabel<janafThermo<equationOfState>::nCoeffs_;
+        coefLabel<janafThermo<EquationOfState>::nCoeffs_;
         coefLabel++
     )
     {
@@ -285,7 +285,7 @@ inline Foam::janafThermo<equationOfState> Foam::operator+
           + molr2*jt2.lowCpCoeffs_[coefLabel];
     }
 
-    return janafThermo<equationOfState>
+    return janafThermo<EquationOfState>
     (
         eofs,
         max(jt1.Tlow_, jt2.Tlow_),
@@ -297,26 +297,26 @@ inline Foam::janafThermo<equationOfState> Foam::operator+
 }
 
 
-template<class equationOfState>
-inline Foam::janafThermo<equationOfState> Foam::operator-
+template<class EquationOfState>
+inline Foam::janafThermo<EquationOfState> Foam::operator-
 (
-    const janafThermo<equationOfState>& jt1,
-    const janafThermo<equationOfState>& jt2
+    const janafThermo<EquationOfState>& jt1,
+    const janafThermo<EquationOfState>& jt2
 )
 {
-    equationOfState eofs = jt1;
+    EquationOfState eofs = jt1;
     eofs -= jt2;
 
     scalar molr1 = jt1.nMoles()/eofs.nMoles();
     scalar molr2 = jt2.nMoles()/eofs.nMoles();
 
-    typename janafThermo<equationOfState>::coeffArray highCpCoeffs;
-    typename janafThermo<equationOfState>::coeffArray lowCpCoeffs;
+    typename janafThermo<EquationOfState>::coeffArray highCpCoeffs;
+    typename janafThermo<EquationOfState>::coeffArray lowCpCoeffs;
 
     for
     (
         register label coefLabel=0;
-        coefLabel<janafThermo<equationOfState>::nCoeffs_;
+        coefLabel<janafThermo<EquationOfState>::nCoeffs_;
         coefLabel++
     )
     {
@@ -329,7 +329,7 @@ inline Foam::janafThermo<equationOfState> Foam::operator-
           - molr2*jt2.lowCpCoeffs_[coefLabel];
     }
 
-    return janafThermo<equationOfState>
+    return janafThermo<EquationOfState>
     (
         eofs,
         max(jt1.Tlow_, jt2.Tlow_),
@@ -341,16 +341,16 @@ inline Foam::janafThermo<equationOfState> Foam::operator-
 }
 
 
-template<class equationOfState>
-inline Foam::janafThermo<equationOfState> Foam::operator*
+template<class EquationOfState>
+inline Foam::janafThermo<EquationOfState> Foam::operator*
 (
     const scalar s,
-    const janafThermo<equationOfState>& jt
+    const janafThermo<EquationOfState>& jt
 )
 {
-    return janafThermo<equationOfState>
+    return janafThermo<EquationOfState>
     (
-        s*static_cast<const equationOfState&>(jt),
+        s*static_cast<const EquationOfState&>(jt),
         jt.Tlow_,
         jt.Thigh_,
         jt.Tcommon_,
@@ -360,11 +360,11 @@ inline Foam::janafThermo<equationOfState> Foam::operator*
 }
 
 
-template<class equationOfState>
-inline Foam::janafThermo<equationOfState> Foam::operator==
+template<class EquationOfState>
+inline Foam::janafThermo<EquationOfState> Foam::operator==
 (
-    const janafThermo<equationOfState>& jt1,
-    const janafThermo<equationOfState>& jt2
+    const janafThermo<EquationOfState>& jt1,
+    const janafThermo<EquationOfState>& jt2
 )
 {
     return jt2 - jt1;
diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C
index 9a5f5866f8..1caf28c185 100644
--- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C
+++ b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C
@@ -28,32 +28,48 @@ License
 
 /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
 
-template<class thermo>
-const Foam::scalar Foam::specieThermo<thermo>::tol_ = 1.0e-4;
+template<class Thermo>
+const Foam::scalar Foam::specieThermo<Thermo>::tol_ = 1.0e-4;
 
-template<class thermo>
-const int Foam::specieThermo<thermo>::maxIter_ = 100;
+template<class Thermo>
+const int Foam::specieThermo<Thermo>::maxIter_ = 100;
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class thermo>
-Foam::specieThermo<thermo>::specieThermo(Istream& is)
+template<class Thermo>
+Foam::specieThermo<Thermo>::specieThermo(Istream& is)
 :
-    thermo(is)
+    Thermo(is)
 {
-    is.check("specieThermo::specieThermo(Istream& is)");
+    is.check("specieThermo<Thermo>::specieThermo(Istream&)");
+}
+
+
+template<class Thermo>
+Foam::specieThermo<Thermo>::specieThermo(const dictionary& dict)
+:
+    Thermo(dict)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Thermo>
+void Foam::specieThermo<Thermo>::write(Ostream& os) const
+{
+    Thermo::write(os);
 }
 
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-template<class thermo>
-Foam::Ostream& Foam::operator<<(Ostream& os, const specieThermo<thermo>& st)
+template<class Thermo>
+Foam::Ostream& Foam::operator<<(Ostream& os, const specieThermo<Thermo>& st)
 {
-    os  << static_cast<const thermo&>(st);
+    os  << static_cast<const Thermo&>(st);
 
-    os.check("Ostream& operator<<(Ostream& os, const specieThermo& st)");
+    os.check("Ostream& operator<<(Ostream&, const specieThermo&)");
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H
index 3b235504c2..26959d8f06 100644
--- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H
+++ b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H
@@ -45,41 +45,41 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-template<class thermo> class specieThermo;
+template<class Thermo> class specieThermo;
 
-template<class thermo>
-inline specieThermo<thermo> operator+
+template<class Thermo>
+inline specieThermo<Thermo> operator+
 (
-    const specieThermo<thermo>&,
-    const specieThermo<thermo>&
+    const specieThermo<Thermo>&,
+    const specieThermo<Thermo>&
 );
 
-template<class thermo>
-inline specieThermo<thermo> operator-
+template<class Thermo>
+inline specieThermo<Thermo> operator-
 (
-    const specieThermo<thermo>&,
-    const specieThermo<thermo>&
+    const specieThermo<Thermo>&,
+    const specieThermo<Thermo>&
 );
 
-template<class thermo>
-inline specieThermo<thermo> operator*
+template<class Thermo>
+inline specieThermo<Thermo> operator*
 (
     const scalar,
-    const specieThermo<thermo>&
+    const specieThermo<Thermo>&
 );
 
-template<class thermo>
-inline specieThermo<thermo> operator==
+template<class Thermo>
+inline specieThermo<Thermo> operator==
 (
-    const specieThermo<thermo>&,
-    const specieThermo<thermo>&
+    const specieThermo<Thermo>&,
+    const specieThermo<Thermo>&
 );
 
-template<class thermo>
+template<class Thermo>
 Ostream& operator<<
 (
     Ostream&,
-    const specieThermo<thermo>&
+    const specieThermo<Thermo>&
 );
 
 
@@ -87,10 +87,10 @@ Ostream& operator<<
                            Class specieThermo Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class thermo>
+template<class Thermo>
 class specieThermo
 :
-    public thermo
+    public Thermo
 {
     // Private data
 
@@ -119,11 +119,14 @@ public:
     // Constructors
 
         //- construct from components
-        inline specieThermo(const thermo& sp);
+        inline specieThermo(const Thermo& sp);
 
         //- Construct from Istream
         specieThermo(Istream&);
 
+        //- Construct from dictionary
+        specieThermo(const dictionary& dict);
+
         //- Construct as named copy
         inline specieThermo(const word& name, const specieThermo&);
 
@@ -248,6 +251,12 @@ public:
             inline scalar TE(const scalar E, const scalar T0) const;
 
 
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
+
+
     // Member operators
 
         inline void operator+=(const specieThermo&);
@@ -258,25 +267,25 @@ public:
 
     // Friend operators
 
-        friend specieThermo operator+ <thermo>
+        friend specieThermo operator+ <Thermo>
         (
             const specieThermo&,
             const specieThermo&
         );
 
-        friend specieThermo operator- <thermo>
+        friend specieThermo operator- <Thermo>
         (
             const specieThermo&,
             const specieThermo&
         );
 
-        friend specieThermo operator* <thermo>
+        friend specieThermo operator* <Thermo>
         (
             const scalar s,
             const specieThermo&
         );
 
-        friend specieThermo operator== <thermo>
+        friend specieThermo operator== <Thermo>
         (
             const specieThermo&,
             const specieThermo&
@@ -285,7 +294,7 @@ public:
 
     // Ostream Operator
 
-        friend Ostream& operator<< <thermo>
+        friend Ostream& operator<< <Thermo>
         (
             Ostream&,
             const specieThermo&
diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H
index 402103f38c..c729cbc42e 100644
--- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H
@@ -27,23 +27,23 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class thermo>
-inline Foam::specieThermo<thermo>::specieThermo
+template<class Thermo>
+inline Foam::specieThermo<Thermo>::specieThermo
 (
-    const thermo& sp
+    const Thermo& sp
 )
 :
-    thermo(sp)
+    Thermo(sp)
 {}
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::T
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::T
 (
     scalar f,
     scalar T0,
-    scalar (specieThermo<thermo>::*F)(const scalar) const,
-    scalar (specieThermo<thermo>::*dFdT)(const scalar) const
+    scalar (specieThermo<Thermo>::*F)(const scalar) const,
+    scalar (specieThermo<Thermo>::*dFdT)(const scalar) const
 ) const
 {
     scalar Test = T0;
@@ -60,9 +60,9 @@ inline Foam::scalar Foam::specieThermo<thermo>::T
         {
             FatalErrorIn
             (
-                "specieThermo<thermo>::T(scalar f, scalar T0, "
-                "scalar (specieThermo<thermo>::*F)(const scalar) const, "
-                "scalar (specieThermo<thermo>::*dFdT)(const scalar) const"
+                "specieThermo<Thermo>::T(scalar f, scalar T0, "
+                "scalar (specieThermo<Thermo>::*F)(const scalar) const, "
+                "scalar (specieThermo<Thermo>::*dFdT)(const scalar) const"
                 ") const"
             )   << "Maximum number of iterations exceeded"
                 << abort(FatalError);
@@ -76,127 +76,127 @@ inline Foam::scalar Foam::specieThermo<thermo>::T
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class thermo>
-inline Foam::specieThermo<thermo>::specieThermo
+template<class Thermo>
+inline Foam::specieThermo<Thermo>::specieThermo
 (
     const word& name,
     const specieThermo& st
 )
 :
-    thermo(name, st)
+    Thermo(name, st)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::cv(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::cv(const scalar T) const
 {
     return this->cp(T) - this->RR;
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::gamma(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::gamma(const scalar T) const
 {
     scalar CP = this->cp(T);
     return CP/(CP - this->RR);
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::e(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::e(const scalar T) const
 {
     return this->h(T) - this->RR*(T - this->Tstd);
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::es(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::es(const scalar T) const
 {
     return this->hs(T) - this->RR*(T - this->Tstd);
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::g(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::g(const scalar T) const
 {
     return this->h(T) - T*this->s(T);
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::a(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::a(const scalar T) const
 {
     return this->e(T) - T*this->s(T);
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::Cp(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::Cp(const scalar T) const
 {
     return this->cp(T)/this->W();
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::Cv(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::Cv(const scalar T) const
 {
     return this->cv(T)/this->W();
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::H(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::H(const scalar T) const
 {
     return this->h(T)/this->W();
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::Hs(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::Hs(const scalar T) const
 {
     return this->hs(T)/this->W();
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::Hc() const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::Hc() const
 {
     return this->hc()/this->W();
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::S(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::S(const scalar T) const
 {
     return this->s(T)/this->W();
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::E(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::E(const scalar T) const
 {
     return this->e(T)/this->W();
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::G(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::G(const scalar T) const
 {
     return this->g(T)/this->W();
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::A(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::A(const scalar T) const
 {
     return this->a(T)/this->W();
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::K(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::K(const scalar T) const
 {
     scalar arg = -this->nMoles()*this->g(T)/(this->RR*T);
 
@@ -211,15 +211,15 @@ inline Foam::scalar Foam::specieThermo<thermo>::K(const scalar T) const
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::Kp(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::Kp(const scalar T) const
 {
     return K(T);
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::Kc(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::Kc(const scalar T) const
 {
     if (equal(this->nMoles(), SMALL))
     {
@@ -232,8 +232,8 @@ inline Foam::scalar Foam::specieThermo<thermo>::Kc(const scalar T) const
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::Kx
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::Kx
 (
     const scalar T,
     const scalar p
@@ -250,8 +250,8 @@ inline Foam::scalar Foam::specieThermo<thermo>::Kx
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::Kn
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::Kn
 (
     const scalar T,
     const scalar p,
@@ -269,117 +269,117 @@ inline Foam::scalar Foam::specieThermo<thermo>::Kn
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::TH
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::TH
 (
     const scalar h,
     const scalar T0
 ) const
 {
-    return T(h, T0, &specieThermo<thermo>::H, &specieThermo<thermo>::Cp);
+    return T(h, T0, &specieThermo<Thermo>::H, &specieThermo<Thermo>::Cp);
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::THs
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::THs
 (
     const scalar hs,
     const scalar T0
 ) const
 {
-    return T(hs, T0, &specieThermo<thermo>::Hs, &specieThermo<thermo>::Cp);
+    return T(hs, T0, &specieThermo<Thermo>::Hs, &specieThermo<Thermo>::Cp);
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::specieThermo<thermo>::TE
+template<class Thermo>
+inline Foam::scalar Foam::specieThermo<Thermo>::TE
 (
     const scalar e,
     const scalar T0
 ) const
 {
-    return T(e, T0, &specieThermo<thermo>::E, &specieThermo<thermo>::Cv);
+    return T(e, T0, &specieThermo<Thermo>::E, &specieThermo<Thermo>::Cv);
 }
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class thermo>
-inline void Foam::specieThermo<thermo>::operator+=
+template<class Thermo>
+inline void Foam::specieThermo<Thermo>::operator+=
 (
-    const specieThermo<thermo>& st
+    const specieThermo<Thermo>& st
 )
 {
-    thermo::operator+=(st);
+    Thermo::operator+=(st);
 }
 
 
-template<class thermo>
-inline void Foam::specieThermo<thermo>::operator-=
+template<class Thermo>
+inline void Foam::specieThermo<Thermo>::operator-=
 (
-    const specieThermo<thermo>& st
+    const specieThermo<Thermo>& st
 )
 {
-    thermo::operator-=(st);
+    Thermo::operator-=(st);
 }
 
 
-template<class thermo>
-inline void Foam::specieThermo<thermo>::operator*=(const scalar s)
+template<class Thermo>
+inline void Foam::specieThermo<Thermo>::operator*=(const scalar s)
 {
-    thermo::operator*=(s);
+    Thermo::operator*=(s);
 }
 
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-template<class thermo>
-inline Foam::specieThermo<thermo> Foam::operator+
+template<class Thermo>
+inline Foam::specieThermo<Thermo> Foam::operator+
 (
-    const specieThermo<thermo>& st1,
-    const specieThermo<thermo>& st2
+    const specieThermo<Thermo>& st1,
+    const specieThermo<Thermo>& st2
 )
 {
-    return specieThermo<thermo>
+    return specieThermo<Thermo>
     (
-        static_cast<const thermo&>(st1) + static_cast<const thermo&>(st2)
+        static_cast<const Thermo&>(st1) + static_cast<const Thermo&>(st2)
     );
 }
 
 
-template<class thermo>
-inline Foam::specieThermo<thermo> Foam::operator-
+template<class Thermo>
+inline Foam::specieThermo<Thermo> Foam::operator-
 (
-    const specieThermo<thermo>& st1,
-    const specieThermo<thermo>& st2
+    const specieThermo<Thermo>& st1,
+    const specieThermo<Thermo>& st2
 )
 {
-    return specieThermo<thermo>
+    return specieThermo<Thermo>
     (
-        static_cast<const thermo&>(st1) - static_cast<const thermo&>(st2)
+        static_cast<const Thermo&>(st1) - static_cast<const Thermo&>(st2)
     );
 }
 
 
-template<class thermo>
-inline Foam::specieThermo<thermo> Foam::operator*
+template<class Thermo>
+inline Foam::specieThermo<Thermo> Foam::operator*
 (
     const scalar s,
-    const specieThermo<thermo>& st
+    const specieThermo<Thermo>& st
 )
 {
-    return specieThermo<thermo>
+    return specieThermo<Thermo>
     (
-        s*static_cast<const thermo&>(st)
+        s*static_cast<const Thermo&>(st)
     );
 }
 
 
-template<class thermo>
-inline Foam::specieThermo<thermo> Foam::operator==
+template<class Thermo>
+inline Foam::specieThermo<Thermo> Foam::operator==
 (
-    const specieThermo<thermo>& st1,
-    const specieThermo<thermo>& st2
+    const specieThermo<Thermo>& st1,
+    const specieThermo<Thermo>& st2
 )
 {
     return st2 - st1;
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C
index 3fabc785a8..ca7efe753b 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.C
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.C
@@ -26,40 +26,54 @@ License
 #include "constTransport.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class thermo>
-constTransport<thermo>::constTransport(Istream& is)
+template<class Thermo>
+Foam::constTransport<Thermo>::constTransport(Istream& is)
 :
-    thermo(is),
-    Mu(readScalar(is)),
-    rPr(1.0/readScalar(is))
+    Thermo(is),
+    mu_(readScalar(is)),
+    rPr_(1.0/readScalar(is))
 {
     is.check("constTransport::constTransport(Istream& is)");
 }
 
 
+template<class Thermo>
+Foam::constTransport<Thermo>::constTransport(const dictionary& dict)
+:
+    Thermo(dict),
+    mu_(readScalar(dict.lookup("mu"))),
+    rPr_(1.0/readScalar(dict.lookup("Pr")))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Thermo>
+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;
+    os  << decrIndent << token::END_BLOCK << nl;
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-template<class thermo>
-Ostream& operator<<(Ostream& os, const constTransport<thermo>& ct)
+template<class Thermo>
+Foam::Ostream& Foam::operator<<(Ostream& os, const constTransport<Thermo>& ct)
 {
-    operator<<(os, static_cast<const thermo&>(ct));
-    os << tab << ct.Mu << tab << 1.0/ct.rPr;
+    operator<<(os, static_cast<const Thermo&>(ct));
+    os << tab << ct.mu_ << tab << 1.0/ct.rPr_;
 
-    os.check("Ostream& operator<<(Ostream& os, const constTransport& ct)");
+    os.check("Ostream& operator<<(Ostream&, const constTransport&)");
 
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H
index ae8d58e57d..0424166031 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.H
@@ -45,41 +45,41 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-template<class thermo> class constTransport;
+template<class Thermo> class constTransport;
 
-template<class thermo>
-inline constTransport<thermo> operator+
+template<class Thermo>
+inline constTransport<Thermo> operator+
 (
-    const constTransport<thermo>&,
-    const constTransport<thermo>&
+    const constTransport<Thermo>&,
+    const constTransport<Thermo>&
 );
 
-template<class thermo>
-inline constTransport<thermo> operator-
+template<class Thermo>
+inline constTransport<Thermo> operator-
 (
-    const constTransport<thermo>&,
-    const constTransport<thermo>&
+    const constTransport<Thermo>&,
+    const constTransport<Thermo>&
 );
 
-template<class thermo>
-inline constTransport<thermo> operator*
+template<class Thermo>
+inline constTransport<Thermo> operator*
 (
     const scalar,
-    const constTransport<thermo>&
+    const constTransport<Thermo>&
 );
 
-template<class thermo>
-inline constTransport<thermo> operator==
+template<class Thermo>
+inline constTransport<Thermo> operator==
 (
-    const constTransport<thermo>&,
-    const constTransport<thermo>&
+    const constTransport<Thermo>&,
+    const constTransport<Thermo>&
 );
 
-template<class thermo>
+template<class Thermo>
 Ostream& operator<<
 (
     Ostream&,
-    const constTransport<thermo>&
+    const constTransport<Thermo>&
 );
 
 
@@ -87,15 +87,18 @@ Ostream& operator<<
                            Class constTransport Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class thermo>
+template<class Thermo>
 class constTransport
 :
-    public thermo
+    public Thermo
 {
     // Private data
 
-        //- Constant viscosity and reciprocal Prandtl Number.
-        scalar Mu, rPr;
+        //- Constant dynamic viscosity [Pa.s]
+        scalar mu_;
+
+        //- Reciprocal Prandtl Number []
+        scalar rPr_;
 
 
     // Private Member Functions
@@ -103,8 +106,8 @@ class constTransport
         //- Construct from components
         inline constTransport
         (
-            const thermo& t,
-            const scalar nu,
+            const Thermo& t,
+            const scalar mu,
             const scalar Pr
         );
 
@@ -119,6 +122,9 @@ public:
         //- Construct from Istream
         constTransport(Istream&);
 
+        //- Construct from dictionary
+        constTransport(const dictionary& dict);
+
 
     // Member functions
 
@@ -134,6 +140,9 @@ public:
         // Species diffusivity
         //inline scalar D(const scalar T) const;
 
+        //- Write to Ostream
+        void write(Ostream& os) const;
+
 
     // Member operators
 
@@ -145,25 +154,25 @@ public:
 
     // Friend operators
 
-        friend constTransport operator+ <thermo>
+        friend constTransport operator+ <Thermo>
         (
             const constTransport&,
             const constTransport&
         );
 
-        friend constTransport operator- <thermo>
+        friend constTransport operator- <Thermo>
         (
             const constTransport&,
             const constTransport&
         );
 
-        friend constTransport operator* <thermo>
+        friend constTransport operator* <Thermo>
         (
             const scalar,
             const constTransport&
         );
 
-        friend constTransport operator== <thermo>
+        friend constTransport operator== <Thermo>
         (
             const constTransport&,
             const constTransport&
@@ -172,7 +181,7 @@ public:
 
     // Ostream Operator
 
-        friend Ostream& operator<< <thermo>
+        friend Ostream& operator<< <Thermo>
         (
             Ostream&,
             const constTransport&
diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H
index 7cb5fa437c..c187a11b4b 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransportI.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H
@@ -23,63 +23,53 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-template<class thermo>
-inline constTransport<thermo>::constTransport
+template<class Thermo>
+inline Foam::constTransport<Thermo>::constTransport
 (
-    const thermo& t,
+    const Thermo& t,
     const scalar mu,
     const scalar Pr
 )
 :
-    thermo(t),
-    Mu(mu),
-    rPr(1.0/Pr)
+    Thermo(t),
+    mu_(mu),
+    rPr_(1.0/Pr)
 {}
 
 
-// Construct as named copy
-template<class thermo>
-inline constTransport<thermo>::constTransport
+template<class Thermo>
+inline Foam::constTransport<Thermo>::constTransport
 (
     const word& name,
     const constTransport& ct
 )
 :
-    thermo(name, ct),
-    Mu(ct.Mu),
-    rPr(ct.rPr)
+    Thermo(name, ct),
+    mu_(ct.mu_),
+    rPr_(ct.rPr_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Dynamic viscosity [kg/ms]
-template<class thermo>
-inline scalar constTransport<thermo>::mu(const scalar) const
+template<class Thermo>
+inline Foam::scalar Foam::constTransport<Thermo>::mu(const scalar) const
 {
-    return Mu;
+    return mu_;
 }
 
 
-// Thermal conductivity [W/mK]
-template<class thermo>
-inline scalar constTransport<thermo>::kappa(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::constTransport<Thermo>::kappa(const scalar T) const
 {
-    return this->Cp(T)*mu(T)*rPr;
+    return this->Cp(T)*mu(T)*rPr_;
 }
 
 
-// Thermal diffusivity for enthalpy [kg/ms]
-template<class thermo>
-inline scalar constTransport<thermo>::alpha(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::constTransport<Thermo>::alpha(const scalar T) const
 {
     scalar Cp_ = this->Cp(T);
 
@@ -87,22 +77,22 @@ inline scalar constTransport<thermo>::alpha(const scalar T) const
     scalar CpBar =
         (deltaT*(this->H(T) - this->H(specie::Tstd)) + Cp_)/(sqr(deltaT) + 1);
 
-    return Cp_*mu(T)*rPr/CpBar;
+    return Cp_*mu(T)*rPr_/CpBar;
 }
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class thermo>
-inline constTransport<thermo>& constTransport<thermo>::operator=
+template<class Thermo>
+inline Foam::constTransport<Thermo>& Foam::constTransport<Thermo>::operator=
 (
-    const constTransport<thermo>& ct
+    const constTransport<Thermo>& ct
 )
 {
-    thermo::operator=(ct);
+    Thermo::operator=(ct);
 
-    Mu = ct.Mu;
-    rPr = ct.rPr;
+    mu_ = ct.mu_;
+    rPr_ = ct.rPr_;
 
     return *this;
 }
@@ -110,83 +100,79 @@ inline constTransport<thermo>& constTransport<thermo>::operator=
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-template<class thermo>
-inline constTransport<thermo> operator+
+template<class Thermo>
+inline Foam::constTransport<Thermo> Foam::operator+
 (
-    const constTransport<thermo>& ct1,
-    const constTransport<thermo>& ct2
+    const constTransport<Thermo>& ct1,
+    const constTransport<Thermo>& ct2
 )
 {
-    thermo t
+    Thermo t
     (
-        static_cast<const thermo&>(ct1) + static_cast<const thermo&>(ct2)
+        static_cast<const Thermo&>(ct1) + static_cast<const Thermo&>(ct2)
     );
 
     scalar molr1 = ct1.nMoles()/t.nMoles();
     scalar molr2 = ct2.nMoles()/t.nMoles();
 
-    return constTransport<thermo>
+    return constTransport<Thermo>
     (
         t,
-        molr1*ct1.Mu + molr2*ct2.Mu,
-        molr1*ct1.rPr + molr2*ct2.rPr
+        molr1*ct1.mu_ + molr2*ct2.mu_,
+        molr1*ct1.rPr_ + molr2*ct2.rPr_
     );
 }
 
 
-template<class thermo>
-inline constTransport<thermo> operator-
+template<class Thermo>
+inline Foam::constTransport<Thermo> Foam::operator-
 (
-    const constTransport<thermo>& ct1,
-    const constTransport<thermo>& ct2
+    const constTransport<Thermo>& ct1,
+    const constTransport<Thermo>& ct2
 )
 {
-    thermo t
+    Thermo t
     (
-        static_cast<const thermo&>(ct1) - static_cast<const thermo&>(ct2)
+        static_cast<const Thermo&>(ct1) - static_cast<const Thermo&>(ct2)
     );
 
     scalar molr1 = ct1.nMoles()/t.nMoles();
     scalar molr2 = ct2.nMoles()/t.nMoles();
 
-    return constTransport<thermo>
+    return constTransport<Thermo>
     (
         t,
-        molr1*ct1.Mu - molr2*ct2.Mu,
-        molr1*ct1.rPr - molr2*ct2.rPr
+        molr1*ct1.mu_ - molr2*ct2.mu_,
+        molr1*ct1.rPr_ - molr2*ct2.rPr_
     );
 }
 
 
-template<class thermo>
-inline constTransport<thermo> operator*
+template<class Thermo>
+inline Foam::constTransport<Thermo> Foam::operator*
 (
     const scalar s,
-    const constTransport<thermo>& ct
+    const constTransport<Thermo>& ct
 )
 {
-    return constTransport<thermo>
+    return constTransport<Thermo>
     (
-        s*static_cast<const thermo&>(ct),
-        ct.Mu,
-        ct.rPr
+        s*static_cast<const Thermo&>(ct),
+        ct.mu_,
+        ct.rPr_
     );
 }
 
 
-template<class thermo>
-inline constTransport<thermo> operator==
+template<class Thermo>
+inline Foam::constTransport<Thermo> Foam::operator==
 (
-    const constTransport<thermo>& ct1,
-    const constTransport<thermo>& ct2
+    const constTransport<Thermo>& ct1,
+    const constTransport<Thermo>& ct2
 )
 {
     return ct2 - ct1;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
index df0c2fc410..99b3e1ebdf 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
@@ -32,11 +32,42 @@ template<class Thermo, int PolySize>
 Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport(Istream& is)
 :
     Thermo(is),
-    muPolynomial_("muPolynomial", is),
-    kappaPolynomial_("kappaPolynomial", is)
+    muCoeffs_("muCoeffs<" + Foam::name(PolySize) + '>', is),
+    kappaCoeffs_("kappaCoeffs<" + Foam::name(PolySize) + '>', is)
 {
-    muPolynomial_ *= this->W();
-    kappaPolynomial_ *= this->W();
+    muCoeffs_ *= this->W();
+    kappaCoeffs_ *= this->W();
+}
+
+
+template<class Thermo, int PolySize>
+Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
+(
+    const dictionary& dict
+)
+:
+    Thermo(dict),
+    muCoeffs_(dict.lookup("muCoeffs<" + Foam::name(PolySize) + '>')),
+    kappaCoeffs_(dict.lookup("kappaCoeffs<" + Foam::name(PolySize) + '>'))
+{
+    muCoeffs_ *= this->W();
+    kappaCoeffs_ *= this->W();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Thermo, int PolySize>
+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;
+    os.writeKeyword(word("kappaCoeffs<" + Foam::name(PolySize) + '>'))
+        << kappaCoeffs_/this->W() << token::END_STATEMENT << nl;
+    os  << decrIndent << token::END_BLOCK << nl;
 }
 
 
@@ -50,8 +81,10 @@ Foam::Ostream& Foam::operator<<
 )
 {
     os  << static_cast<const Thermo&>(pt) << tab
-        << "muPolynomial" << tab << pt.muPolynomial_/pt.W() << tab
-        << "kappaPolynomial" << tab << pt.kappaPolynomial_/pt.W();
+        << "muCoeffs<" << Foam::name(PolySize) << '>' << tab
+        << pt.muCoeffs_/pt.W() << tab
+        << "kappaCoeffs<" << Foam::name(PolySize) << '>' << tab
+        << pt.kappaCoeffs_/pt.W();
 
     os.check
     (
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
index 7167d5c56c..014ad05d2d 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
@@ -94,13 +94,13 @@ class polynomialTransport
 {
     // Private data
 
-        //- Dynamic viscosity
+        //- Dynamic viscosity polynomial coefficients
         //  Note: input in [Pa.s], but internally uses [Pa.s/kmol]
-        Polynomial<PolySize> muPolynomial_;
+        Polynomial<PolySize> muCoeffs_;
 
-        //- Thermal conductivity
+        //- Thermal conductivity polynomial coefficients
         //  Note: input in [W/m/K], but internally uses [W/m/K/kmol]
-        Polynomial<PolySize> kappaPolynomial_;
+        Polynomial<PolySize> kappaCoeffs_;
 
 
     // Private Member Functions
@@ -127,12 +127,18 @@ public:
         //- Construct from Istream
         polynomialTransport(Istream& is);
 
+        //- Construct from dictionary
+        polynomialTransport(const dictionary& dict);
+
         //- Construct and return a clone
         inline autoPtr<polynomialTransport> clone() const;
 
         // Selector from Istream
         inline static autoPtr<polynomialTransport> New(Istream& is);
 
+        // Selector from dictionary
+        inline static autoPtr<polynomialTransport> New(const dictionary& dict);
+
 
     // Member functions
 
@@ -148,6 +154,9 @@ public:
         // Species diffusivity
         //inline scalar D(const scalar T) const;
 
+        //- Write to Ostream
+        void write(Ostream& os) const;
+
 
     // Member operators
 
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
index ee94f6d0e7..52094247fb 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
@@ -34,8 +34,8 @@ inline Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
 )
 :
     Thermo(pt),
-    muPolynomial_(pt.muPolynomial_),
-    kappaPolynomial_(pt.kappaPolynomial_)
+    muCoeffs_(pt.muCoeffs_),
+    kappaCoeffs_(pt.kappaCoeffs_)
 {}
 
 
@@ -43,13 +43,13 @@ template<class Thermo, int PolySize>
 inline Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
 (
     const Thermo& t,
-    const Polynomial<PolySize>& muPoly,
-    const Polynomial<PolySize>& kappaPoly
+    const Polynomial<PolySize>& muCoeffs,
+    const Polynomial<PolySize>& kappaCoeffs
 )
 :
     Thermo(t),
-    muPolynomial_(muPoly),
-    kappaPolynomial_(kappaPoly)
+    muCoeffs_(muCoeffs),
+    kappaCoeffs_(kappaCoeffs)
 {}
 
 
@@ -61,8 +61,8 @@ inline Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
 )
 :
     Thermo(name, pt),
-    muPolynomial_(pt.muPolynomial_),
-    kappaPolynomial_(pt.kappaPolynomial_)
+    muCoeffs_(pt.muCoeffs_),
+    kappaCoeffs_(pt.kappaCoeffs_)
 {}
 
 
@@ -88,6 +88,17 @@ Foam::polynomialTransport<Thermo, PolySize>::New(Istream& is)
 }
 
 
+template<class Thermo, int PolySize>
+inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize> >
+Foam::polynomialTransport<Thermo, PolySize>::New(const dictionary& dict)
+{
+    return autoPtr<polynomialTransport<Thermo, PolySize> >
+    (
+        new polynomialTransport<Thermo, PolySize>(dict)
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Thermo, int PolySize>
@@ -96,7 +107,7 @@ inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::mu
     const scalar T
 ) const
 {
-    return muPolynomial_.evaluate(T)/this->W();
+    return muCoeffs_.evaluate(T)/this->W();
 }
 
 
@@ -106,7 +117,7 @@ inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::kappa
     const scalar T
 ) const
 {
-    return kappaPolynomial_.evaluate(T)/this->W();
+    return kappaCoeffs_.evaluate(T)/this->W();
 }
 
 
@@ -136,8 +147,8 @@ Foam::polynomialTransport<Thermo, PolySize>::operator=
 {
     Thermo::operator=(pt);
 
-    muPolynomial_ = pt.muPolynomial_;
-    kappaPolynomial_ = pt.kappaPolynomial_;
+    muCoeffs_ = pt.muCoeffs_;
+    kappaCoeffs_ = pt.kappaCoeffs_;
 
     return *this;
 }
@@ -156,8 +167,8 @@ inline void Foam::polynomialTransport<Thermo, PolySize>::operator+=
     molr1 /= this->nMoles();
     scalar molr2 = pt.nMoles()/this->nMoles();
 
-    muPolynomial_ = molr1*muPolynomial_ + molr2*pt.muPolynomial_;
-    kappaPolynomial_ = molr1*kappaPolynomial_ + molr2*pt.kappaPolynomial_;
+    muCoeffs_ = molr1*muCoeffs_ + molr2*pt.muCoeffs_;
+    kappaCoeffs_ = molr1*kappaCoeffs_ + molr2*pt.kappaCoeffs_;
 }
 
 
@@ -174,8 +185,8 @@ inline void Foam::polynomialTransport<Thermo, PolySize>::operator-=
     molr1 /= this->nMoles();
     scalar molr2 = pt.nMoles()/this->nMoles();
 
-    muPolynomial_ = molr1*muPolynomial_ - molr2*pt.muPolynomial_;
-    kappaPolynomial_ = molr1*kappaPolynomial_ - molr2*pt.kappaPolynomial_;
+    muCoeffs_ = molr1*muCoeffs_ - molr2*pt.muCoeffs_;
+    kappaCoeffs_ = molr1*kappaCoeffs_ - molr2*pt.kappaCoeffs_;
 }
 
 
@@ -209,8 +220,8 @@ inline Foam::polynomialTransport<Thermo, PolySize> Foam::operator+
     return polynomialTransport<Thermo, PolySize>
     (
         t,
-        molr1*pt1.muPolynomial_ + molr2*pt2.muPolynomial_,
-        molr1*pt1.kappaPolynomial_ + molr2*pt2.kappaPolynomial_
+        molr1*pt1.muCoeffs_ + molr2*pt2.muCoeffs_,
+        molr1*pt1.kappaCoeffs_ + molr2*pt2.kappaCoeffs_
     );
 }
 
@@ -233,8 +244,8 @@ inline Foam::polynomialTransport<Thermo, PolySize> Foam::operator-
     return polynomialTransport<Thermo, PolySize>
     (
         t,
-        molr1*pt1.muPolynomial_ - molr2*pt2.muPolynomial_,
-        molr1*pt1.kappaPolynomial_ - molr2*pt2.kappaPolynomial_
+        molr1*pt1.muCoeffs_ - molr2*pt2.muCoeffs_,
+        molr1*pt1.kappaCoeffs_ - molr2*pt2.kappaCoeffs_
     );
 }
 
@@ -249,8 +260,8 @@ inline Foam::polynomialTransport<Thermo, PolySize> Foam::operator*
     return polynomialTransport<Thermo, PolySize>
     (
         s*static_cast<const Thermo&>(pt),
-        pt.muPolynomial_,
-        pt.kappaPolynomial_
+        pt.muCoeffs_,
+        pt.kappaCoeffs_
     );
 }
 
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
index 9c1853b5f2..69ab41db97 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
@@ -29,14 +29,9 @@ License
 #include "speciesTransport.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-speciesTransport::speciesTransport(Istream& is)
+Foam::speciesTransport::speciesTransport(Istream& is)
 :
     janafThermo(is)
 {
@@ -44,20 +39,33 @@ speciesTransport::speciesTransport(Istream& is)
 }
 
 
+Foam::speciesTransport::speciesTransport(const dictionary& dict)
+:
+    janafThermo(dict)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::speciesTransport::write(Ostream& os) const
+{
+    os  << this->name() << endl;
+    os  << token::BEGIN_BLOCK << incrIndent << nl;
+    janafThermo::write(os);
+    os  << decrIndent << token::END_BLOCK << nl;
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Ostream& operator<<(Ostream& os, const speciesTransport& sTranport)
+Foam::Ostream& Foam::operator<<(Ostream& os, const speciesTransport& sTranport)
 {
     os << (const janafThermo&)sTranport;
 
-    os.check("Ostream& operator<<(Ostream& os, const speciesTransport& st)");
+    os.check("Ostream& operator<<(Ostream&, const speciesTransport)");
 
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
index 95ffc6ad67..582de1f8a3 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
@@ -64,14 +64,14 @@ public:
     // Constructors
 
         //- Construct from speciesThermo
-        inline speciesTransport
-        (
-            const janafThermo& sThermo
-        );
+        inline speciesTransport(const janafThermo& sThermo);
 
         //- Construct from Istream
         speciesTransport(Istream&);
 
+        //- Construct from dictionary
+        speciesTransport(const dictionary& dict);
+
 
     // Member Functions
 
@@ -87,6 +87,9 @@ public:
         // Species diffusivity
         //inline scalar D(const scalar T) const;
 
+        //- Write to Ostream
+        void write(Ostream& os) const;
+
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransportI.H b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransportI.H
index e3ac8f2189..a58c73de24 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransportI.H
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransportI.H
@@ -23,25 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from speciesThermo
-inline speciesTransport::speciesTransport
-(
-    const janafThermo& sThermo
-)
+inline Foam::speciesTransport::speciesTransport(const janafThermo& sThermo)
 :
     janafThermo(sThermo)
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
index aabacb72bc..d210cab1d0 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
@@ -26,42 +26,58 @@ License
 #include "sutherlandTransport.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class thermo>
-sutherlandTransport<thermo>::sutherlandTransport(Istream& is)
+template<class Thermo>
+Foam::sutherlandTransport<Thermo>::sutherlandTransport(Istream& is)
 :
-    thermo(is),
-    As(readScalar(is)),
-    Ts(readScalar(is))
+    Thermo(is),
+    As_(readScalar(is)),
+    Ts_(readScalar(is))
 {
-    is.check("sutherlandTransport<thermo>::sutherlandTransport(Istream&)");
+    is.check("sutherlandTransport<Thermo>::sutherlandTransport(Istream&)");
 }
 
 
+template<class Thermo>
+Foam::sutherlandTransport<Thermo>::sutherlandTransport(const dictionary& dict)
+:
+    Thermo(dict),
+    As_(readScalar(dict.lookup("As"))),
+    Ts_(readScalar(dict.lookup("Ts")))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Thermo>
+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;
+    os  << decrIndent << token::END_BLOCK << nl;
+}
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-template<class thermo>
-Ostream& operator<<(Ostream& os, const sutherlandTransport<thermo>& st)
+template<class Thermo>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os, const sutherlandTransport<Thermo>& st
+)
 {
-    os << static_cast<const thermo&>(st) << tab << st.As << tab << st.Ts;
+    os << static_cast<const Thermo&>(st) << tab << st.As_ << tab << st.Ts_;
 
     os.check
     (
-        "Ostream& operator<<(Ostream&, const sutherlandTransport<thermo>&)"
+        "Ostream& operator<<(Ostream&, const sutherlandTransport<Thermo>&)"
     );
 
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
index 72755607aa..80cc3ff5d4 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
@@ -51,57 +51,57 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-template<class thermo> class sutherlandTransport;
+template<class Thermo> class sutherlandTransport;
 
-template<class thermo>
-inline sutherlandTransport<thermo> operator+
+template<class Thermo>
+inline sutherlandTransport<Thermo> operator+
 (
-    const sutherlandTransport<thermo>&,
-    const sutherlandTransport<thermo>&
+    const sutherlandTransport<Thermo>&,
+    const sutherlandTransport<Thermo>&
 );
 
-template<class thermo>
-inline sutherlandTransport<thermo> operator-
+template<class Thermo>
+inline sutherlandTransport<Thermo> operator-
 (
-    const sutherlandTransport<thermo>&,
-    const sutherlandTransport<thermo>&
+    const sutherlandTransport<Thermo>&,
+    const sutherlandTransport<Thermo>&
 );
 
-template<class thermo>
-inline sutherlandTransport<thermo> operator*
+template<class Thermo>
+inline sutherlandTransport<Thermo> operator*
 (
     const scalar,
-    const sutherlandTransport<thermo>&
+    const sutherlandTransport<Thermo>&
 );
 
-template<class thermo>
-inline sutherlandTransport<thermo> operator==
+template<class Thermo>
+inline sutherlandTransport<Thermo> operator==
 (
-    const sutherlandTransport<thermo>&,
-    const sutherlandTransport<thermo>&
+    const sutherlandTransport<Thermo>&,
+    const sutherlandTransport<Thermo>&
 );
 
-template<class thermo>
+template<class Thermo>
 Ostream& operator<<
 (
     Ostream&,
-    const sutherlandTransport<thermo>&
+    const sutherlandTransport<Thermo>&
 );
 
 
 /*---------------------------------------------------------------------------*\
-                           Class sutherlandTransport Declaration
+                    Class sutherlandTransport Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class thermo>
+template<class Thermo>
 class sutherlandTransport
 :
-    public thermo
+    public Thermo
 {
     // Private data
 
         // Sutherland's coefficients
-        scalar As, Ts;
+        scalar As_, Ts_;
 
 
     // Private Member Functions
@@ -122,15 +122,15 @@ public:
         //- Construct from components
         inline sutherlandTransport
         (
-            const thermo& t,
-            const scalar as,
-            const scalar ts
+            const Thermo& t,
+            const scalar As,
+            const scalar Ts
         );
 
         //- Construct from two viscosities
         inline sutherlandTransport
         (
-            const thermo& t,
+            const Thermo& t,
             const scalar mu1, const scalar T1,
             const scalar mu2, const scalar T2
         );
@@ -141,12 +141,18 @@ public:
         //- Construct from Istream
         sutherlandTransport(Istream&);
 
+        //- Construct from dictionary
+        sutherlandTransport(const dictionary& dict);
+
         //- Construct and return a clone
         inline autoPtr<sutherlandTransport> clone() const;
 
         // Selector from Istream
         inline static autoPtr<sutherlandTransport> New(Istream& is);
 
+        // Selector from dictionary
+        inline static autoPtr<sutherlandTransport> New(const dictionary& dict);
+
 
     // Member functions
 
@@ -162,6 +168,9 @@ public:
         // Species diffusivity
         //inline scalar D(const scalar T) const;
 
+        //- Write to Ostream
+        void write(Ostream& os) const;
+
 
     // Member operators
 
@@ -173,25 +182,25 @@ public:
 
     // Friend operators
 
-        friend sutherlandTransport operator+ <thermo>
+        friend sutherlandTransport operator+ <Thermo>
         (
             const sutherlandTransport&,
             const sutherlandTransport&
         );
 
-        friend sutherlandTransport operator- <thermo>
+        friend sutherlandTransport operator- <Thermo>
         (
             const sutherlandTransport&,
             const sutherlandTransport&
         );
 
-        friend sutherlandTransport operator* <thermo>
+        friend sutherlandTransport operator* <Thermo>
         (
             const scalar,
             const sutherlandTransport&
         );
 
-        friend sutherlandTransport operator== <thermo>
+        friend sutherlandTransport operator== <Thermo>
         (
             const sutherlandTransport&,
             const sutherlandTransport&
@@ -200,7 +209,7 @@ public:
 
     // Ostream Operator
 
-        friend Ostream& operator<< <thermo>
+        friend Ostream& operator<< <Thermo>
         (
             Ostream&,
             const sutherlandTransport&
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
index ee1849655e..3320a8ae3a 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
@@ -25,15 +25,10 @@ License
 
 #include "specie.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class thermo>
-inline void sutherlandTransport<thermo>::calcCoeffs
+template<class Thermo>
+inline void Foam::sutherlandTransport<Thermo>::calcCoeffs
 (
     const scalar mu1, const scalar T1,
     const scalar mu2, const scalar T2
@@ -43,106 +38,119 @@ inline void sutherlandTransport<thermo>::calcCoeffs
     scalar mu1rootT2 = mu1*sqrt(T2);
     scalar mu2rootT1 = mu2*rootT1;
 
-    Ts = (mu2rootT1 - mu1rootT2)/(mu1rootT2/T1 - mu2rootT1/T2);
+    Ts_ = (mu2rootT1 - mu1rootT2)/(mu1rootT2/T1 - mu2rootT1/T2);
 
-    As = mu1*(1.0 + Ts/T1)/rootT1;
+    As_ = mu1*(1.0 + Ts_/T1)/rootT1;
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-template<class thermo>
-inline sutherlandTransport<thermo>::sutherlandTransport
+template<class Thermo>
+inline Foam::sutherlandTransport<Thermo>::sutherlandTransport
 (
-    const thermo& t,
-    const scalar as,
-    const scalar ts
+    const Thermo& t,
+    const scalar As,
+    const scalar Ts
 )
 :
-    thermo(t),
-    As(as),
-    Ts(ts)
+    Thermo(t),
+    As_(As),
+    Ts_(Ts)
 {}
 
 
-// Construct from components
-template<class thermo>
-inline sutherlandTransport<thermo>::sutherlandTransport
+template<class Thermo>
+inline Foam::sutherlandTransport<Thermo>::sutherlandTransport
 (
-    const thermo& t,
+    const Thermo& t,
     const scalar mu1, const scalar T1,
     const scalar mu2, const scalar T2
 )
 :
-    thermo(t)
+    Thermo(t)
 {
     calcCoeffs(mu1, T1, mu2, T2);
 }
 
 
-//- Construct as named copy
-template<class thermo>
-inline sutherlandTransport<thermo>::sutherlandTransport
+template<class Thermo>
+inline Foam::sutherlandTransport<Thermo>::sutherlandTransport
 (
     const word& name,
     const sutherlandTransport& st
 )
 :
-    thermo(name, st),
-    As(st.As),
-    Ts(st.Ts)
+    Thermo(name, st),
+    As_(st.As_),
+    Ts_(st.Ts_)
 {}
 
 
-// Construct and return a clone
-template<class thermo>
-inline autoPtr<sutherlandTransport<thermo> > sutherlandTransport<thermo>::clone
-() const
+template<class Thermo>
+inline Foam::autoPtr<Foam::sutherlandTransport<Thermo> >
+Foam::sutherlandTransport<Thermo>::clone() const
 {
-    return autoPtr<sutherlandTransport<thermo> >
+    return autoPtr<sutherlandTransport<Thermo> >
     (
-        new sutherlandTransport<thermo>(*this)
+        new sutherlandTransport<Thermo>(*this)
     );
 }
 
 
-// Selector from Istream
-template<class thermo>
-inline autoPtr<sutherlandTransport<thermo> > sutherlandTransport<thermo>::New
+template<class Thermo>
+inline Foam::autoPtr<Foam::sutherlandTransport<Thermo> >
+Foam::sutherlandTransport<Thermo>::New
 (
     Istream& is
 )
 {
-    return autoPtr<sutherlandTransport<thermo> >
+    return autoPtr<sutherlandTransport<Thermo> >
     (
-        new sutherlandTransport<thermo>(is)
+        new sutherlandTransport<Thermo>(is)
+    );
+}
+
+
+template<class Thermo>
+inline Foam::autoPtr<Foam::sutherlandTransport<Thermo> >
+Foam::sutherlandTransport<Thermo>::New
+(
+    const dictionary& dict
+)
+{
+    return autoPtr<sutherlandTransport<Thermo> >
+    (
+        new sutherlandTransport<Thermo>(dict)
     );
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Dynamic viscosity [kg/ms]
-template<class thermo>
-inline scalar sutherlandTransport<thermo>::mu(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::sutherlandTransport<Thermo>::mu(const scalar T) const
 {
-    return As*::sqrt(T)/(1.0 + Ts/T);
+    return As_*::sqrt(T)/(1.0 + Ts_/T);
 }
 
 
-// Thermal conductivity [W/mK]
-template<class thermo>
-inline scalar sutherlandTransport<thermo>::kappa(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::sutherlandTransport<Thermo>::kappa
+(
+    const scalar T
+) const
 {
     scalar Cv_ = this->Cv(T);
     return mu(T)*Cv_*(1.32 + 1.77*this->R()/Cv_);
 }
 
 
-// Thermal diffusivity for enthalpy [kg/ms]
-template<class thermo>
-inline scalar sutherlandTransport<thermo>::alpha(const scalar T) const
+template<class Thermo>
+inline Foam::scalar Foam::sutherlandTransport<Thermo>::alpha
+(
+    const scalar T
+) const
 {
     scalar Cv_ = this->Cv(T);
     scalar R_ = this->R();
@@ -158,16 +166,17 @@ inline scalar sutherlandTransport<thermo>::alpha(const scalar T) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class thermo>
-inline sutherlandTransport<thermo>& sutherlandTransport<thermo>::operator=
+template<class Thermo>
+inline Foam::sutherlandTransport<Thermo>&
+Foam::sutherlandTransport<Thermo>::operator=
 (
-    const sutherlandTransport<thermo>& st
+    const sutherlandTransport<Thermo>& st
 )
 {
-    thermo::operator=(st);
+    Thermo::operator=(st);
 
-    As = st.As;
-    Ts = st.Ts;
+    As_ = st.As_;
+    Ts_ = st.Ts_;
 
     return *this;
 }
@@ -175,83 +184,79 @@ inline sutherlandTransport<thermo>& sutherlandTransport<thermo>::operator=
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-template<class thermo>
-inline sutherlandTransport<thermo> operator+
+template<class Thermo>
+inline Foam::sutherlandTransport<Thermo> Foam::operator+
 (
-    const sutherlandTransport<thermo>& st1,
-    const sutherlandTransport<thermo>& st2
+    const sutherlandTransport<Thermo>& st1,
+    const sutherlandTransport<Thermo>& st2
 )
 {
-    thermo t
+    Thermo t
     (
-        static_cast<const thermo&>(st1) + static_cast<const thermo&>(st2)
+        static_cast<const Thermo&>(st1) + static_cast<const Thermo&>(st2)
     );
 
     scalar molr1 = st1.nMoles()/t.nMoles();
     scalar molr2 = st2.nMoles()/t.nMoles();
 
-    return sutherlandTransport<thermo>
+    return sutherlandTransport<Thermo>
     (
         t,
-        molr1*st1.As + molr2*st2.As,
-        molr1*st1.Ts + molr2*st2.Ts
+        molr1*st1.As_ + molr2*st2.As_,
+        molr1*st1.Ts_ + molr2*st2.Ts_
     );
 }
 
 
-template<class thermo>
-inline sutherlandTransport<thermo> operator-
+template<class Thermo>
+inline Foam::sutherlandTransport<Thermo> Foam::operator-
 (
-    const sutherlandTransport<thermo>& st1,
-    const sutherlandTransport<thermo>& st2
+    const sutherlandTransport<Thermo>& st1,
+    const sutherlandTransport<Thermo>& st2
 )
 {
-    thermo t
+    Thermo t
     (
-        static_cast<const thermo&>(st1) - static_cast<const thermo&>(st2)
+        static_cast<const Thermo&>(st1) - static_cast<const Thermo&>(st2)
     );
 
     scalar molr1 = st1.nMoles()/t.nMoles();
     scalar molr2 = st2.nMoles()/t.nMoles();
 
-    return sutherlandTransport<thermo>
+    return sutherlandTransport<Thermo>
     (
         t,
-        molr1*st1.As - molr2*st2.As,
-        molr1*st1.Ts - molr2*st2.Ts
+        molr1*st1.As_ - molr2*st2.As_,
+        molr1*st1.Ts_ - molr2*st2.Ts_
     );
 }
 
 
-template<class thermo>
-inline sutherlandTransport<thermo> operator*
+template<class Thermo>
+inline Foam::sutherlandTransport<Thermo> Foam::operator*
 (
     const scalar s,
-    const sutherlandTransport<thermo>& st
+    const sutherlandTransport<Thermo>& st
 )
 {
-    return sutherlandTransport<thermo>
+    return sutherlandTransport<Thermo>
     (
-        s*static_cast<const thermo&>(st),
-        st.As,
-        st.Ts
+        s*static_cast<const Thermo&>(st),
+        st.As_,
+        st.Ts_
     );
 }
 
 
-template<class thermo>
-inline sutherlandTransport<thermo> operator==
+template<class Thermo>
+inline Foam::sutherlandTransport<Thermo> Foam::operator==
 (
-    const sutherlandTransport<thermo>& st1,
-    const sutherlandTransport<thermo>& st2
+    const sutherlandTransport<Thermo>& st1,
+    const sutherlandTransport<Thermo>& st2
 )
 {
     return st2 - st1;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
index 512746722c..dba5a3d470 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
@@ -32,6 +32,8 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace porousMedia
 {
     defineTypeNameAndDebug(fixedTemperature, 0);
 
@@ -42,11 +44,12 @@ namespace Foam
         pZone
     );
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::fixedTemperature::fixedTemperature(const porousZone& pZone)
+Foam::porousMedia::fixedTemperature::fixedTemperature(const porousZone& pZone)
 :
     thermalModel(pZone, typeName),
     T_(readScalar(coeffDict_.lookup("T")))
@@ -55,13 +58,13 @@ Foam::fixedTemperature::fixedTemperature(const porousZone& pZone)
 
 // * * * * * * * * * * * * * * * * Destructor    * * * * * * * * * * * * * * //
 
-Foam::fixedTemperature::~fixedTemperature()
+Foam::porousMedia::fixedTemperature::~fixedTemperature()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::fixedTemperature::addEnthalpySource
+void Foam::porousMedia::fixedTemperature::addEnthalpySource
 (
     const basicThermo& thermo,
     const volScalarField& rho,
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
index 11c1c7c442..4ae9aab656 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::fixedTemperature
+    Foam::porousMedia::fixedTemperature
 
 Description
-    Fixed temperature model
+    Fixed temperature model for porous media
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,6 +40,8 @@ Description
 
 namespace Foam
 {
+namespace porousMedia
+{
 
 /*---------------------------------------------------------------------------*\
                       Class fixedTemperature Declaration
@@ -86,6 +88,10 @@ public:
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace porousMedia
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
index a7c3dfd017..b654bef6f6 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
@@ -33,20 +33,23 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(noThermalModel, 0);
+namespace porousMedia
+{
+   defineTypeNameAndDebug(noThermalModel, 0);
 
-    addToRunTimeSelectionTable
-    (
-        thermalModel,
-        noThermalModel,
-        pZone
-    );
+   addToRunTimeSelectionTable
+   (
+       thermalModel,
+       noThermalModel,
+       pZone
+   );
+}
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::noThermalModel::noThermalModel(const porousZone& pZone)
+Foam::porousMedia::noThermalModel::noThermalModel(const porousZone& pZone)
 :
     thermalModel(pZone)
 {}
@@ -54,13 +57,13 @@ Foam::noThermalModel::noThermalModel(const porousZone& pZone)
 
 // * * * * * * * * * * * * * * * * Destructor    * * * * * * * * * * * * * * //
 
-Foam::noThermalModel::~noThermalModel()
+Foam::porousMedia::noThermalModel::~noThermalModel()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::noThermalModel::addEnthalpySource
+void Foam::porousMedia::noThermalModel::addEnthalpySource
 (
     const basicThermo&,
     const volScalarField&,
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
index af23d09feb..123a9b2fd5 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::noThermalModel
+    Foam::porousMedia::noThermalModel
 
 Description
-    Dummy model for 'none' option
+    A dummy thermal model porous media, corresponding to the 'none' option
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,9 +40,11 @@ Description
 
 namespace Foam
 {
+namespace porousMedia
+{
 
 /*---------------------------------------------------------------------------*\
-                      Class noThermalModel Declaration
+                       Class noThermalModel Declaration
 \*---------------------------------------------------------------------------*/
 
 class noThermalModel
@@ -59,7 +61,7 @@ public:
     // Constructors
 
         //- Construct from porous zone
-        noThermalModel(const porousZone& pZone);
+        noThermalModel(const porousZone&);
 
 
     //- Destructor
@@ -78,6 +80,10 @@ public:
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace porousMedia
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C
index e8ba858b8c..d7e36c8ed8 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C
@@ -29,21 +29,24 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(thermalModel, 0);
-    defineRunTimeSelectionTable(thermalModel, pZone);
+namespace porousMedia
+{
+   defineTypeNameAndDebug(thermalModel, 0);
+   defineRunTimeSelectionTable(thermalModel, pZone);
+}
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermalModel::thermalModel(const porousZone& pZone)
+Foam::porousMedia::thermalModel::thermalModel(const porousZone& pZone)
 :
     pZone_(pZone),
     coeffDict_(dictionary::null)
 {}
 
 
-Foam::thermalModel::thermalModel
+Foam::porousMedia::thermalModel::thermalModel
 (
     const porousZone& pZone,
     const word& modelType
@@ -56,7 +59,7 @@ Foam::thermalModel::thermalModel
 
 // * * * * * * * * * * * * * * * * Destructor    * * * * * * * * * * * * * * //
 
-Foam::thermalModel::~thermalModel()
+Foam::porousMedia::thermalModel::~thermalModel()
 {}
 
 
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
index c6bd861919..bda42db68e 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermalModel
+    Foam::porousMedia::thermalModel
 
 Description
-    Base class for selecting the temperature specification models
+    Base class to select the temperature specification models for porousMedia
 
 \*---------------------------------------------------------------------------*/
 
@@ -43,10 +43,14 @@ Description
 namespace Foam
 {
 
+// Forward declaration of classes
 class basicThermo;
 
+namespace porousMedia
+{
+
 /*---------------------------------------------------------------------------*\
-                      Class thermalModel Declaration
+                        Class thermalModel Declaration
 \*---------------------------------------------------------------------------*/
 
 class thermalModel
@@ -84,10 +88,10 @@ public:
     // Constructors
 
         //- Construct null from porous zone
-        thermalModel(const porousZone& pZone);
+        thermalModel(const porousZone&);
 
         //- Construct from porous zone and model type name
-        thermalModel(const porousZone& pZone, const word& modelType);
+        thermalModel(const porousZone&, const word& modelType);
 
 
     //- Destructor
@@ -95,7 +99,7 @@ public:
 
 
     //- Selector
-    static autoPtr<thermalModel> New(const porousZone& pZone);
+    static autoPtr<thermalModel> New(const porousZone&);
 
 
     // Member Functions
@@ -110,6 +114,10 @@ public:
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace porousMedia
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C
index e97685a3fc..8b89b7eef1 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C
@@ -27,7 +27,8 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::thermalModel> Foam::thermalModel::New
+Foam::autoPtr<Foam::porousMedia::thermalModel>
+Foam::porousMedia::thermalModel::New
 (
     const porousZone& pZone
 )
@@ -43,7 +44,7 @@ Foam::autoPtr<Foam::thermalModel> Foam::thermalModel::New
     {
         FatalErrorIn
         (
-            "thermalModel::New(const porousZone&)"
+            "porousMedia::thermalModel::New(const porousZone&)"
         )   << "Unknown thermalModel type "
             << modelType << nl << nl
             << "Valid thermalModel types are :" << endl
@@ -51,7 +52,7 @@ Foam::autoPtr<Foam::thermalModel> Foam::thermalModel::New
             << abort(FatalError);
     }
 
-    return autoPtr<thermalModel>(cstrIter()(pZone));
+    return autoPtr<porousMedia::thermalModel>(cstrIter()(pZone));
 }
 
 
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
index 6e19d7a177..bd5c378308 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
@@ -38,7 +38,7 @@ Foam::thermalPorousZone::thermalPorousZone
 )
 :
     porousZone(key, mesh, dict),
-    model_(thermalModel::New(*this))
+    model_(porousMedia::thermalModel::New(*this))
 {}
 
 
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
index 3264194939..6164420e8f 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
@@ -68,7 +68,7 @@ class thermalPorousZone
         void operator=(const thermalPorousZone&);
 
         //- Thermal model
-        autoPtr<thermalModel> model_;
+        autoPtr<porousMedia::thermalModel> model_;
 
 
 public:
diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
index 7466afb4c2..908b2fedc3 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
@@ -30,14 +30,60 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(APIdiffCoefFunc, 0);
+    addToRunTimeSelectionTable
+    (
+        thermophysicalFunction,
+        APIdiffCoefFunc,
+        Istream
+    );
+    addToRunTimeSelectionTable
+    (
+        thermophysicalFunction,
+        APIdiffCoefFunc,
+        dictionary
+    );
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(APIdiffCoefFunc, 0);
-addToRunTimeSelectionTable(thermophysicalFunction, APIdiffCoefFunc, Istream);
+Foam::APIdiffCoefFunc::APIdiffCoefFunc
+(
+    const scalar a,
+    const scalar b,
+    const scalar wf,
+    const scalar wa
+)
+:
+    a_(a),
+    b_(b),
+    wf_(wf),
+    wa_(wa),
+    alpha_(sqrt(1/wf_ + 1/wa_)),
+    beta_(sqr(cbrt(a_) + cbrt(b_)))
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::APIdiffCoefFunc::APIdiffCoefFunc(Istream& is)
+:
+    a_(readScalar(is)),
+    b_(readScalar(is)),
+    wf_(readScalar(is)),
+    wa_(readScalar(is)),
+    alpha_(sqrt(1/wf_ + 1/wa_)),
+    beta_(sqr((cbrt(a_) + cbrt(b_))))
+{}
+
+
+Foam::APIdiffCoefFunc::APIdiffCoefFunc(const dictionary& dict)
+:
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    wf_(readScalar(dict.lookup("wf"))),
+    wa_(readScalar(dict.lookup("wa"))),
+    alpha_(sqrt(1/wf_ + 1/wa_)),
+    beta_(sqr((cbrt(a_) + cbrt(b_))))
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
index 93ad9fb88d..65645cea4c 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
@@ -71,26 +71,19 @@ public:
     // Constructors
 
         //- Construct from components
-        APIdiffCoefFunc(scalar a, scalar b, scalar wf, scalar wa)
-        :
-            a_(a),
-            b_(b),
-            wf_(wf),
-            wa_(wa),
-            alpha_(sqrt(1/wf_ + 1/wa_)),
-            beta_(sqr(cbrt(a_) + cbrt(b_)))
-        {}
+        APIdiffCoefFunc
+        (
+            const scalar a,
+            const scalar b,
+            const scalar wf,
+            const scalar wa
+        );
 
         //- Construct from Istream
-        APIdiffCoefFunc(Istream& is)
-        :
-            a_(readScalar(is)),
-            b_(readScalar(is)),
-            wf_(readScalar(is)),
-            wa_(readScalar(is)),
-            alpha_(sqrt(1/wf_ + 1/wa_)),
-            beta_(sqr((cbrt(a_) + cbrt(b_))))
-        {}
+        APIdiffCoefFunc(Istream& is);
+
+        //- Construct from dictionary
+        APIdiffCoefFunc(const dictionary& dict);
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
index 54696aba1a..7d3333f2e6 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
@@ -30,14 +30,52 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(NSRDSfunc0, 0);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc0, Istream);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc0, dictionary);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(NSRDSfunc0, 0);
-addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc0, Istream);
+Foam::NSRDSfunc0::NSRDSfunc0
+(
+    const scalar a,
+    const scalar b,
+    const scalar c,
+    const scalar d,
+    const scalar e,
+    const scalar f
+)
+:
+    a_(a),
+    b_(b),
+    c_(c),
+    d_(d),
+    e_(e),
+    f_(f)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::NSRDSfunc0::NSRDSfunc0(Istream& is)
+:
+    a_(readScalar(is)),
+    b_(readScalar(is)),
+    c_(readScalar(is)),
+    d_(readScalar(is)),
+    e_(readScalar(is)),
+    f_(readScalar(is))
+{}
+
+
+Foam::NSRDSfunc0::NSRDSfunc0(const dictionary& dict)
+:
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    c_(readScalar(dict.lookup("c"))),
+    d_(readScalar(dict.lookup("d"))),
+    e_(readScalar(dict.lookup("e"))),
+    f_(readScalar(dict.lookup("f")))
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H
index a924cb658a..4faac5710d 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H
@@ -84,26 +84,21 @@ public:
     // Constructors
 
         //- Construct from components
-        NSRDSfunc0(scalar a, scalar b, scalar c, scalar d, scalar e, scalar f)
-        :
-            a_(a),
-            b_(b),
-            c_(c),
-            d_(d),
-            e_(e),
-            f_(f)
-        {}
+        NSRDSfunc0
+        (
+            const scalar a,
+            const scalar b,
+            const scalar c,
+            const scalar d,
+            const scalar e,
+            const scalar f
+        );
 
         //- Construct from Istream
-        NSRDSfunc0(Istream& is)
-        :
-            a_(readScalar(is)),
-            b_(readScalar(is)),
-            c_(readScalar(is)),
-            d_(readScalar(is)),
-            e_(readScalar(is)),
-            f_(readScalar(is))
-        {}
+        NSRDSfunc0(Istream& is);
+
+        //- Construct from dictionary
+        NSRDSfunc0(const dictionary& dict);
 
 
     // Member Functions
@@ -114,7 +109,6 @@ public:
             return ((((f_*T + e_)*T + d_)*T + c_)*T + b_)*T + a_;
         }
 
-
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
index 88d3e10f4b..c647f200fc 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
@@ -30,14 +30,48 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(NSRDSfunc1, 0);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc1, Istream);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc1, dictionary);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(NSRDSfunc1, 0);
-addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc1, Istream);
+Foam::NSRDSfunc1::NSRDSfunc1
+(
+    const scalar a,
+    const scalar b,
+    const scalar c,
+    const scalar d,
+    const scalar e
+)
+:
+    a_(a),
+    b_(b),
+    c_(c),
+    d_(d),
+    e_(e)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::NSRDSfunc1::NSRDSfunc1(Istream& is)
+:
+    a_(readScalar(is)),
+    b_(readScalar(is)),
+    c_(readScalar(is)),
+    d_(readScalar(is)),
+    e_(readScalar(is))
+{}
+
+
+Foam::NSRDSfunc1::NSRDSfunc1(const dictionary& dict)
+:
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    c_(readScalar(dict.lookup("c"))),
+    d_(readScalar(dict.lookup("d"))),
+    e_(readScalar(dict.lookup("e")))
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H
index 291bdd5b0b..05e1777020 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H
@@ -84,24 +84,20 @@ public:
     // Constructors
 
         //- Construct from components
-        NSRDSfunc1(scalar a, scalar b, scalar c, scalar d, scalar e)
-        :
-            a_(a),
-            b_(b),
-            c_(c),
-            d_(d),
-            e_(e)
-        {}
+        NSRDSfunc1
+        (
+            const scalar a,
+            const scalar b,
+            const scalar c,
+            const scalar d,
+            const scalar e
+        );
 
         //- Construct from Istream
-        NSRDSfunc1(Istream& is)
-        :
-            a_(readScalar(is)),
-            b_(readScalar(is)),
-            c_(readScalar(is)),
-            d_(readScalar(is)),
-            e_(readScalar(is))
-        {}
+        NSRDSfunc1(Istream& is);
+
+        //- Construct from dictionary
+        NSRDSfunc1(const dictionary& dict);
 
 
     // Member Functions
@@ -112,7 +108,6 @@ public:
             return exp(a_ + b_/T + c_*log(T) + d_*pow(T, e_));
         }
 
-
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
index 3b9f959120..421c24f6cb 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
@@ -30,14 +30,53 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(NSRDSfunc14, 0);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc14, Istream);
+    addToRunTimeSelectionTable
+    (
+        thermophysicalFunction,
+        NSRDSfunc14,
+        dictionary
+    );
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(NSRDSfunc14, 0);
-addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc14, Istream);
+Foam::NSRDSfunc14::NSRDSfunc14
+(
+    const scalar Tc,
+    const scalar a,
+    const scalar b,
+    const scalar c,
+    const scalar d
+)
+:
+    Tc_(Tc),
+    a_(a),
+    b_(b),
+    c_(c),
+    d_(d)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::NSRDSfunc14::NSRDSfunc14(Istream& is)
+:
+    Tc_(readScalar(is)),
+    a_(readScalar(is)),
+    b_(readScalar(is)),
+    c_(readScalar(is)),
+    d_(readScalar(is))
+{}
+
+
+Foam::NSRDSfunc14::NSRDSfunc14(const dictionary& dict)
+:
+    Tc_(readScalar(dict.lookup("Tc"))),
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    c_(readScalar(dict.lookup("c"))),
+    d_(readScalar(dict.lookup("d")))
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H
index 3e27776c7b..4b976815eb 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H
@@ -84,24 +84,20 @@ public:
     // Constructors
 
         //- Construct from components
-        NSRDSfunc14(scalar Tc, scalar a, scalar b, scalar c, scalar d)
-        :
-            Tc_(Tc),
-            a_(a),
-            b_(b),
-            c_(c),
-            d_(d)
-        {}
+        NSRDSfunc14
+        (
+            const scalar Tc,
+            const scalar a,
+            const scalar b,
+            const scalar c,
+            const scalar d
+        );
 
         //- Construct from Istream
-        NSRDSfunc14(Istream& is)
-        :
-            Tc_(readScalar(is)),
-            a_(readScalar(is)),
-            b_(readScalar(is)),
-            c_(readScalar(is)),
-            d_(readScalar(is))
-        {}
+        NSRDSfunc14(Istream& is);
+
+        //- Construct from dictionary
+        NSRDSfunc14(const dictionary& dict);
 
 
     // Member Functions
@@ -118,7 +114,6 @@ public:
                 );
         }
 
-
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
index fde6e6bce9..31cbc6010a 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
@@ -30,14 +30,44 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(NSRDSfunc2, 0);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc2, Istream);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc2, dictionary);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(NSRDSfunc2, 0);
-addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc2, Istream);
+Foam::NSRDSfunc2::NSRDSfunc2
+(
+    const scalar a,
+    const scalar b,
+    const scalar c,
+    const scalar d
+)
+:
+    a_(a),
+    b_(b),
+    c_(c),
+    d_(d)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::NSRDSfunc2::NSRDSfunc2(Istream& is)
+:
+    a_(readScalar(is)),
+    b_(readScalar(is)),
+    c_(readScalar(is)),
+    d_(readScalar(is))
+{}
+
+
+Foam::NSRDSfunc2::NSRDSfunc2(const dictionary& dict)
+:
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    c_(readScalar(dict.lookup("c"))),
+    d_(readScalar(dict.lookup("d")))
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H
index aa21385bea..0b38ed44e8 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H
@@ -84,22 +84,19 @@ public:
     // Constructors
 
         //- Construct from components
-        NSRDSfunc2(scalar a, scalar b, scalar c, scalar d)
-        :
-            a_(a),
-            b_(b),
-            c_(c),
-            d_(d)
-        {}
+        NSRDSfunc2
+        (
+            const scalar a,
+            const scalar b,
+            const scalar c,
+            const scalar d
+        );
 
         //- Construct from Istream
-        NSRDSfunc2(Istream& is)
-        :
-            a_(readScalar(is)),
-            b_(readScalar(is)),
-            c_(readScalar(is)),
-            d_(readScalar(is))
-        {}
+        NSRDSfunc2(Istream& is);
+
+        //- Construct from dictionary
+        NSRDSfunc2(const dictionary& dict);
 
 
     // Member Functions
@@ -110,7 +107,6 @@ public:
             return a_*pow(T, b_)/(1.0 + c_/T + d_/sqr(T));
         }
 
-
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
index 61724bd1d7..cd65cfc206 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
@@ -30,14 +30,44 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(NSRDSfunc3, 0);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc3, Istream);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc3, dictionary);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(NSRDSfunc3, 0);
-addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc3, Istream);
+Foam::NSRDSfunc3::NSRDSfunc3
+(
+    const scalar a,
+    const scalar b,
+    const scalar c,
+    const scalar d
+)
+:
+    a_(a),
+    b_(b),
+    c_(c),
+    d_(d)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::NSRDSfunc3::NSRDSfunc3(Istream& is)
+:
+    a_(readScalar(is)),
+    b_(readScalar(is)),
+    c_(readScalar(is)),
+    d_(readScalar(is))
+{}
+
+
+Foam::NSRDSfunc3::NSRDSfunc3(const dictionary& dict)
+:
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    c_(readScalar(dict.lookup("c"))),
+    d_(readScalar(dict.lookup("d")))
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H
index 94e2c10374..6c678b3aa7 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H
@@ -84,22 +84,19 @@ public:
     // Constructors
 
         //- Construct from components
-        NSRDSfunc3(scalar a, scalar b, scalar c, scalar d)
-        :
-            a_(a),
-            b_(b),
-            c_(c),
-            d_(d)
-        {}
+        NSRDSfunc3
+        (
+            const scalar a,
+            const scalar b,
+            const scalar c,
+            const scalar d
+        );
 
         //- Construct from Istream
-        NSRDSfunc3(Istream& is)
-        :
-            a_(readScalar(is)),
-            b_(readScalar(is)),
-            c_(readScalar(is)),
-            d_(readScalar(is))
-        {}
+        NSRDSfunc3(Istream& is);
+
+        //- Construct from dictionary
+        NSRDSfunc3(const dictionary& dict);
 
 
     // Member Functions
@@ -110,7 +107,6 @@ public:
             return a_ + b_*exp(-c_/pow(T, d_));
         }
 
-
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
index 0520763dd2..347ae5b458 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
@@ -30,14 +30,48 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(NSRDSfunc4, 0);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc4, Istream);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc4, dictionary);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(NSRDSfunc4, 0);
-addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc4, Istream);
+Foam::NSRDSfunc4::NSRDSfunc4
+(
+    const scalar a,
+    const scalar b,
+    const scalar c,
+    const scalar d,
+    const scalar e
+)
+:
+    a_(a),
+    b_(b),
+    c_(c),
+    d_(d),
+    e_(e)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::NSRDSfunc4::NSRDSfunc4(Istream& is)
+:
+    a_(readScalar(is)),
+    b_(readScalar(is)),
+    c_(readScalar(is)),
+    d_(readScalar(is)),
+    e_(readScalar(is))
+{}
+
+
+Foam::NSRDSfunc4::NSRDSfunc4(const dictionary& dict)
+:
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    c_(readScalar(dict.lookup("c"))),
+    d_(readScalar(dict.lookup("d"))),
+    e_(readScalar(dict.lookup("e")))
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H
index a1323d40b8..90576e94e9 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H
@@ -84,24 +84,20 @@ public:
     // Constructors
 
         //- Construct from components
-        NSRDSfunc4(scalar a, scalar b, scalar c, scalar d, scalar e)
-        :
-            a_(a),
-            b_(b),
-            c_(c),
-            d_(d),
-            e_(e)
-        {}
+        NSRDSfunc4
+        (
+            const scalar a,
+            const scalar b,
+            const scalar c,
+            const scalar d,
+            const scalar e
+        );
 
         //- Construct from Istream
-        NSRDSfunc4(Istream& is)
-        :
-            a_(readScalar(is)),
-            b_(readScalar(is)),
-            c_(readScalar(is)),
-            d_(readScalar(is)),
-            e_(readScalar(is))
-        {}
+        NSRDSfunc4(Istream& is);
+
+        //- Construct from dictionary
+        NSRDSfunc4(const dictionary& dict);
 
 
     // Member Functions
@@ -112,7 +108,6 @@ public:
             return a_ + b_/T + c_/pow(T, 3) + d_/pow(T, 8) + e_/pow(T, 9);
         }
 
-
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
index 12f931f60a..a0ba6ea881 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
@@ -30,14 +30,44 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(NSRDSfunc5, 0);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc5, Istream);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc5, dictionary);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(NSRDSfunc5, 0);
-addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc5, Istream);
+Foam::NSRDSfunc5::NSRDSfunc5
+(
+    const scalar a,
+    const scalar b,
+    const scalar c,
+    const scalar d
+)
+:
+    a_(a),
+    b_(b),
+    c_(c),
+    d_(d)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::NSRDSfunc5::NSRDSfunc5(Istream& is)
+:
+    a_(readScalar(is)),
+    b_(readScalar(is)),
+    c_(readScalar(is)),
+    d_(readScalar(is))
+{}
+
+
+Foam::NSRDSfunc5::NSRDSfunc5(const dictionary& dict)
+:
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    c_(readScalar(dict.lookup("c"))),
+    d_(readScalar(dict.lookup("d")))
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H
index d1c9b87e0f..8d95533b81 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H
@@ -84,22 +84,19 @@ public:
     // Constructors
 
         //- Construct from components
-        NSRDSfunc5(scalar a, scalar b, scalar c, scalar d)
-        :
-            a_(a),
-            b_(b),
-            c_(c),
-            d_(d)
-        {}
+        NSRDSfunc5
+        (
+            const scalar a,
+            const scalar b,
+            const scalar c,
+            const scalar d
+        );
 
         //- Construct from Istream
-        NSRDSfunc5(Istream& is)
-        :
-            a_(readScalar(is)),
-            b_(readScalar(is)),
-            c_(readScalar(is)),
-            d_(readScalar(is))
-        {}
+        NSRDSfunc5(Istream& is);
+
+        //- Construct from dictionary
+        NSRDSfunc5(const dictionary& dict);
 
 
     // Member Functions
@@ -110,7 +107,6 @@ public:
             return a_/pow(b_, 1 + pow(1 - T/c_, d_));
         }
 
-
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
index 0d4b1d2ccd..acfd675072 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
@@ -30,14 +30,52 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(NSRDSfunc6, 0);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc6, Istream);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc6, dictionary);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(NSRDSfunc6, 0);
-addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc6, Istream);
+Foam::NSRDSfunc6::NSRDSfunc6
+(
+    const scalar Tc,
+    const scalar a,
+    const scalar b,
+    const scalar c,
+    const scalar d,
+    const scalar e
+)
+:
+    Tc_(Tc),
+    a_(a),
+    b_(b),
+    c_(c),
+    d_(d),
+    e_(e)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::NSRDSfunc6::NSRDSfunc6(Istream& is)
+:
+    Tc_(readScalar(is)),
+    a_(readScalar(is)),
+    b_(readScalar(is)),
+    c_(readScalar(is)),
+    d_(readScalar(is)),
+    e_(readScalar(is))
+{}
+
+
+Foam::NSRDSfunc6::NSRDSfunc6(const dictionary& dict)
+:
+    Tc_(readScalar(dict.lookup("Tc"))),
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    c_(readScalar(dict.lookup("c"))),
+    d_(readScalar(dict.lookup("d"))),
+    e_(readScalar(dict.lookup("e")))
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H
index f538c744e9..9623bc36eb 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H
@@ -84,26 +84,21 @@ public:
     // Constructors
 
         //- Construct from components
-        NSRDSfunc6(scalar Tc, scalar a, scalar b, scalar c, scalar d, scalar e)
-        :
-            Tc_(Tc),
-            a_(a),
-            b_(b),
-            c_(c),
-            d_(d),
-            e_(e)
-        {}
+        NSRDSfunc6
+        (
+            const scalar Tc,
+            const scalar a,
+            const scalar b,
+            const scalar c,
+            const scalar d,
+            const scalar e
+        );
 
         //- Construct from Istream
-        NSRDSfunc6(Istream& is)
-        :
-            Tc_(readScalar(is)),
-            a_(readScalar(is)),
-            b_(readScalar(is)),
-            c_(readScalar(is)),
-            d_(readScalar(is)),
-            e_(readScalar(is))
-        {}
+        NSRDSfunc6(Istream& is);
+
+        //- Construct from dictionary
+        NSRDSfunc6(const dictionary& dict);
 
 
     // Member Functions
@@ -115,7 +110,6 @@ public:
             return a_*pow(1 - Tr, ((e_*Tr + d_)*Tr + c_)*Tr + b_);
         }
 
-
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
index b5b14a5161..2d15a63dad 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
@@ -30,14 +30,48 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(NSRDSfunc7, 0);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc7, Istream);
+    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc7, dictionary);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(NSRDSfunc7, 0);
-addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc7, Istream);
+Foam::NSRDSfunc7::NSRDSfunc7
+(
+    const scalar a,
+    const scalar b,
+    const scalar c,
+    const scalar d,
+    const scalar e
+)
+:
+    a_(a),
+    b_(b),
+    c_(c),
+    d_(d),
+    e_(e)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::NSRDSfunc7::NSRDSfunc7(Istream& is)
+:
+    a_(readScalar(is)),
+    b_(readScalar(is)),
+    c_(readScalar(is)),
+    d_(readScalar(is)),
+    e_(readScalar(is))
+{}
+
+
+Foam::NSRDSfunc7::NSRDSfunc7(const dictionary& dict)
+:
+    a_(readScalar(dict.lookup("a"))),
+    b_(readScalar(dict.lookup("b"))),
+    c_(readScalar(dict.lookup("c"))),
+    d_(readScalar(dict.lookup("d"))),
+    e_(readScalar(dict.lookup("e")))
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H
index ed70b6c90f..0bc7552ff4 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H
@@ -84,24 +84,20 @@ public:
     // Constructors
 
         //- Construct from components
-        NSRDSfunc7(scalar a, scalar b, scalar c, scalar d, scalar e)
-        :
-            a_(a),
-            b_(b),
-            c_(c),
-            d_(d),
-            e_(e)
-        {}
+        NSRDSfunc7
+        (
+            const scalar a,
+            const scalar b,
+            const scalar c,
+            const scalar d,
+            const scalar e
+        );
 
         //- Construct from Istream
-        NSRDSfunc7(Istream& is)
-        :
-            a_(readScalar(is)),
-            b_(readScalar(is)),
-            c_(readScalar(is)),
-            d_(readScalar(is)),
-            e_(readScalar(is))
-        {}
+        NSRDSfunc7(Istream& is);
+
+        //- Construct from dictionary
+        NSRDSfunc7(const dictionary& dict);
 
 
     // Member Functions
@@ -112,7 +108,6 @@ public:
             return a_ + b_*sqr((c_/T)/sinh(c_/T)) + d_*sqr((e_/T)/cosh(e_/T));
         }
 
-
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
index aea12464ba..73845d6311 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
@@ -34,6 +34,7 @@ namespace Foam
 {
     defineTypeNameAndDebug(thermophysicalFunction, 0);
     defineRunTimeSelectionTable(thermophysicalFunction, Istream);
+    defineRunTimeSelectionTable(thermophysicalFunction, dictionary);
 }
 
 
@@ -70,4 +71,37 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
     return autoPtr<thermophysicalFunction>(cstrIter()(is));
 }
 
+
+Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
+(
+    const dictionary& dict
+)
+{
+    if (debug)
+    {
+        Info<< "thermophysicalFunction::New(const dictionary&) : "
+            << "constructing thermophysicalFunction"
+            << endl;
+    }
+
+    const word thermophysicalFunctionType(dict.lookup("functionType"));
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(thermophysicalFunctionType);
+
+    if (cstrIter == IstreamConstructorTablePtr_->end())
+    {
+        FatalErrorIn("thermophysicalFunction::New(const dictionary&)")
+            << "Unknown thermophysicalFunction type "
+            << thermophysicalFunctionType
+            << nl << nl
+            << "Valid thermophysicalFunction types are :" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << abort(FatalError);
+    }
+
+    return autoPtr<thermophysicalFunction>(cstrIter()(dict));
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
index 84ab7beede..dc155a0276 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
@@ -37,6 +37,7 @@ Description
 #include "typeInfo.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,7 +45,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class thermophysicalFunction Declaration
+                    Class thermophysicalFunction Declaration
 \*---------------------------------------------------------------------------*/
 
 class thermophysicalFunction
@@ -67,6 +68,15 @@ public:
             (is)
         );
 
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            thermophysicalFunction,
+            dictionary,
+            (const dictionary& dict),
+            (dict)
+        );
+
 
     // Constructors
 
@@ -74,9 +84,12 @@ public:
         thermophysicalFunction()
         {}
 
-        //- Return a pointer to a new thermophysicalFunction created from input
+        //- Return pointer to new thermophysicalFunction created from input
         static autoPtr<thermophysicalFunction> New(Istream& is);
 
+        //- Return pointer to new thermophysicalFunction created from dict
+        static autoPtr<thermophysicalFunction> New(const dictionary& dict);
+
 
     //- Destructor
     virtual ~thermophysicalFunction()
diff --git a/src/transportModels/twoPhaseInterfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseInterfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 1d030286cf..53e2bdc5c8 100644
--- a/src/transportModels/twoPhaseInterfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseInterfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -33,20 +33,20 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(alphaContactAngleFvPatchScalarField, 0);
-}
 
-template<>
-const char* Foam::NamedEnum
-<
-    Foam::alphaContactAngleFvPatchScalarField::limitControls,
-    4
->::names[] =
-{
-    "none",
-    "gradient",
-    "zeroGradient",
-    "alpha"
-};
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::alphaContactAngleFvPatchScalarField::limitControls,
+        4
+    >::names[] =
+    {
+        "none",
+        "gradient",
+        "zeroGradient",
+        "alpha"
+    };
+}
 
 const Foam::NamedEnum
 <
diff --git a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
index af250a25f7..d97395d864 100644
--- a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
+++ b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
@@ -137,7 +137,7 @@ void smoothDelta::calcDelta()
         changedFacesInfo,
         faceDeltaData,
         cellDeltaData,
-        mesh_.globalData().nTotalCells()    // max iterations
+        mesh_.globalData().nTotalCells()+1   // max iterations
     );
 
     forAll(delta_, cellI)
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index 486eccaa98..4a76228d23 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -172,7 +172,7 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
     (
         IOobject
         (
-            "epsilon",
+            "nut",
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
index 89589bf816..c6fe1f8df5 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
@@ -15,44 +15,35 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType
-    hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
+thermoType      hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
-stoichiometricAirFuelMassRatio
-    stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
 
-// phi = 0.57
-// ft = 0.0352993
-// Tad = 1650.1
+reactants
+{
+    nMoles          1;
+    molWeight       29.2068;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-fuel fuel       1       44.0962
-    100 5000    1000
-    7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923
-    0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017
-    1.67212e-06 170.672;
+products
+{
+    nMoles          1;
+    molWeight       28.5396;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-oxidant oxidant 1       28.8504
-    100 6000    1000
-    3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597
-    3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239
-    1.67212e-06 170.672;
-
-reactants reactants     1       29.2068
-    100 5000    1000
-    3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241
-    3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856
-    1.67212e-06 170.672;
-
-burntProducts burntProducts     1       28.3233
-    100 6000    1000
-    3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104
-    3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188
-    1.67212e-06 170.672;
-
-products products       1       28.5396
-    100 5000    1000
-    3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744
-    3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336
-    1.67212e-06 170.672;
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
index 89589bf816..c6fe1f8df5 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
@@ -15,44 +15,35 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType
-    hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
+thermoType      hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
-stoichiometricAirFuelMassRatio
-    stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
 
-// phi = 0.57
-// ft = 0.0352993
-// Tad = 1650.1
+reactants
+{
+    nMoles          1;
+    molWeight       29.2068;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-fuel fuel       1       44.0962
-    100 5000    1000
-    7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923
-    0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017
-    1.67212e-06 170.672;
+products
+{
+    nMoles          1;
+    molWeight       28.5396;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-oxidant oxidant 1       28.8504
-    100 6000    1000
-    3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597
-    3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239
-    1.67212e-06 170.672;
-
-reactants reactants     1       29.2068
-    100 5000    1000
-    3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241
-    3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856
-    1.67212e-06 170.672;
-
-burntProducts burntProducts     1       28.3233
-    100 6000    1000
-    3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104
-    3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188
-    1.67212e-06 170.672;
-
-products products       1       28.5396
-    100 5000    1000
-    3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744
-    3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336
-    1.67212e-06 170.672;
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
index 606d7f335f..87599e72f0 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
@@ -19,15 +19,31 @@ thermoType      hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieTh
 
 stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
 
-fuel            fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672;
+reactants
+{
+    nMoles          24.8095;
+    molWeight       29.4649;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-oxidant         oxidant 1 28.8504 200 6000 1000 3.10205 0.00123963 -4.17512e-07 6.60292e-11 -3.87448e-15 -985.517 5.35187 3.58378 -0.0007269 1.66985e-06 -1.08452e-10 -4.31951e-13 -1050.53 3.11223 1.67212e-06 170.672;
-
-reactants       reactants 24.8095 29.4649 200 5000 1000 3.28069 0.00195035 -6.53483e-07 1.00239e-10 -5.64653e-15 -1609.55 4.41496 3.47696 0.000367499 1.84866e-06 -9.8993e-10 -3.10214e-14 -1570.81 3.76075 1.67212e-06 170.672;
-
-products        products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672;
-
-burntProducts   burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672;
+products
+{
+    nMoles          1;
+    molWeight       28.3233;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties
index 42fa0ce32a..ba1621ceec 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties
@@ -27,7 +27,10 @@ liquidComponents ( C7H16 );
 
 liquidProperties
 {
-    C7H16           C7H16 defaultCoeffs;
+    C7H16
+    {
+        defaultCoeffs   yes;
+    }
 }
 
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
index 9be4d5e4a9..e2e943d38b 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
@@ -19,15 +19,44 @@ thermoType      hhuMixtureThermo<inhomogeneousMixture<sutherlandTransport<specie
 
 stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336;
 
-fuel            fuel 1 114.23 298.15 5000 1000 19.3963 0.0488137 -1.55798e-05 2.17831e-09 -1.08391e-13 -37133.9 -78.8531 0.429357 0.0765769 8.41306e-06 -5.86603e-08 2.79414e-11 -30446.4 25.6735 1.67212e-06 170.672;
+fuel
+{
+    nMoles          1;
+    molWeight       114.23;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-oxidant         oxidant 1 28.8504 200 6000 1000 3.10205 0.00123963 -4.17512e-07 6.60292e-11 -3.87448e-15 -985.517 5.35187 3.58378 -0.0007269 1.66985e-06 -1.08452e-10 -4.31951e-13 -1050.53 3.11223 1.67212e-06 170.672;
+oxidant
+{
+    nMoles          1;
+    molWeight       28.8504;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-reactants       reactants 1 28.8647 298.15 5000 1000 3.10405 0.00124937 -4.21362e-07 6.67706e-11 -3.93029e-15 -991.338 5.34182 3.58325 -0.00071402 1.6717e-06 -1.19038e-10 -4.27e-13 -1055.47 3.11618 1.67212e-06 170.672;
-
-products        products 1 28.8478 298.15 5000 1000 3.10156 0.00124723 -4.2071e-07 6.66805e-11 -3.92581e-15 -1092.96 5.35255 3.58264 -0.000711179 1.64893e-06 -9.37968e-11 -4.35761e-13 -1158.24 3.11438 1.67212e-06 170.672;
-
-burntProducts   burntProducts 1 28.6068 200 6000 1000 3.12468 0.00178578 -5.94695e-07 9.09801e-11 -5.1246e-15 -11005.8 5.03593 3.47612 0.000758205 -3.68739e-07 1.3449e-09 -8.08868e-13 -11071.5 3.3058 1.67212e-06 170.672;
+burntProducts
+{
+    nMoles          1;
+    molWeight       28.8478;
+    Tlow            298.15;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 3.10156 0.00124723 -4.2071e-07 6.66805e-11 -3.92581e-15 -1092.96 5.35255 );
+    lowCpCoeffs     ( 3.58264 -0.000711179 1.64893e-06 -9.37968e-11 -4.35761e-13 -1158.24 3.11438 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
index ac2d781874..8692562e9e 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
@@ -1,55 +1,66 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-    class           dictionary;
-    object          thermophysicalProperties;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType hsPsiMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
+thermoType      hsPsiMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 17.1271;
-stoichiometricOxygenFuelMassRatio stoichiometricOxygenFuelMassRatio [0 0 0 0 0 0 0] 4.0;
-qFuel qFuel [0 2 -2 0 0 0 0] 5.00264e+07;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 17.1271;
 
-fuel fuel   1   16.0428
-    200 6000    1000
-    1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937
-    5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132
-    1.67212e-06 170.672;
+stoichiometricOxygenFuelMassRatio stoichiometricOxygenFuelMassRatio [ 0 0 0 0 0 0 0 ] 4;
 
-oxidant  oxidant   1   28.8504
-    200 6000    1000
-    3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597
-    3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239
-    1.67212e-06 170.672;
+qFuel           qFuel [ 0 2 -2 0 0 0 0 ] 5.00264e+07;
 
-reactants reactants  1   27.6004
-    200 6000    1000
-    2.95825 0.00210441 -7.06762e-07 1.12145e-10 -6.61028e-15 -1865.61 5.80859
-    3.73662 -0.00199028 6.30727e-06 -4.82941e-09 1.23723e-12 -1948.03 2.35566
-    1.67212e-06 170.672;
+fuel
+{
+    nMoles          1;
+    molWeight       16.0428;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-burntProducts burntProducts  1   27.6334
-    200 6000    1000
-    3.0602 0.00182422 -5.93878e-07 8.93807e-11 -4.97595e-15 -10998.7 5.32209
-    3.54628 0.000378279 2.02797e-07 9.31602e-10 -6.84016e-13 -11102.1 2.90098
-    1.67212e-06 170.672;
+oxidant
+{
+    nMoles          1;
+    molWeight       28.8504;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-products  products  1   27.6004
-    200 6000    1000
-    3.05615 0.0018477 -6.01767e-07 9.06474e-11 -5.05149e-15 -10995.9 5.33537
-    3.55084 0.000338343 3.42018e-07 7.91162e-10 -6.34688e-13 -11099.7 2.87954
-    1.67212e-06 170.672;
+burntProducts
+{
+    nMoles          1;
+    molWeight       27.6334;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
index 090dd1c924..8692562e9e 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
@@ -2,53 +2,65 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-    class           dictionary;
-    object          thermophysicalProperties;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType hsPsiMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
+thermoType      hsPsiMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 17.1271;
-stoichiometricOxygenFuelMassRatio stoichiometricOxygenFuelMassRatio [0 0 0 0 0 0 0] 4.0;
-qFuel qFuel [0 2 -2 0 0 0 0] 5.00264e+07;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 17.1271;
 
-fuel fuel   1   16.0428
-    200 6000    1000
-    1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937
-    5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132
-    1.67212e-06 170.672;
+stoichiometricOxygenFuelMassRatio stoichiometricOxygenFuelMassRatio [ 0 0 0 0 0 0 0 ] 4;
 
-oxidant  oxidant   1   28.8504
-    200 6000    1000
-    3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597
-    3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239
-    1.67212e-06 170.672;
+qFuel           qFuel [ 0 2 -2 0 0 0 0 ] 5.00264e+07;
 
-reactants reactants  1   27.6004
-    200 6000    1000
-    2.95825 0.00210441 -7.06762e-07 1.12145e-10 -6.61028e-15 -1865.61 5.80859
-    3.73662 -0.00199028 6.30727e-06 -4.82941e-09 1.23723e-12 -1948.03 2.35566
-    1.67212e-06 170.672;
+fuel
+{
+    nMoles          1;
+    molWeight       16.0428;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-burntProducts burntProducts  1   27.6334
-    200 6000    1000
-    3.0602 0.00182422 -5.93878e-07 8.93807e-11 -4.97595e-15 -10998.7 5.32209
-    3.54628 0.000378279 2.02797e-07 9.31602e-10 -6.84016e-13 -11102.1 2.90098
-    1.67212e-06 170.672;
+oxidant
+{
+    nMoles          1;
+    molWeight       28.8504;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
-products  products  1   27.6004
-    200 6000    1000
-    3.05615 0.0018477 -6.01767e-07 9.06474e-11 -5.05149e-15 -10995.9 5.33537
-    3.55084 0.000338343 3.42018e-07 7.91162e-10 -6.34688e-13 -11099.7 2.87954
-    1.67212e-06 170.672;
+burntProducts
+{
+    nMoles          1;
+    molWeight       27.6334;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions
index e9a256e2da..a97d6d6c18 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions
@@ -8,8 +8,17 @@ species
 );
 
 reactions
-(
+{
     irreversibleArrheniusReaction
-    CH4 + 2O2 = CO2 + 2H2O
-    (5.2e16 0  14906)
-);
\ No newline at end of file
+    {
+        reaction     "CH4 + 2O2 = CO2 + 2H2O";
+        A            5.2e16;
+        beta         0;
+        Ta           14906;
+    }
+}
+
+//    irreversibleArrheniusReaction
+//    CH4 + 2O2 = CO2 + 2H2O
+//    (5.2e16 0  14906)
+//);
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
index 9b202c3435..67f8e677a4 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
@@ -1,28 +1,84 @@
-(
-O2 O2   1   31.9988
-    200 5000    1000
-    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
-    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
-    1.67212e-06 170.672
-H2O H2O 1   18.0153
-    200 5000    1000
-    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
-    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
-    1.67212e-06 170.672
-CH4 CH4   1   16.0428
-    200 6000    1000
-    1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937
-    5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132
-    1.67212e-06 170.672
-CO2 CO2 1   44.01
-    200 5000    1000
-    4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396
-    2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885
-    1.67212e-06 170.672
-N2 N2   1   28.0134
-    200 5000    1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
-    1.67212e-06 170.672
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermo.compressibleGas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+CH4
+{
+    nMoles          1;
+    molWeight       16.0428;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+CO2
+{
+    nMoles          1;
+    molWeight       44.01;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index 4cf1dd6e3c..9e271d5129 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.96 1004.5 0 1.458e-06 110.4;
+mixture
+{
+    nMoles          1;
+    molWeight       28.96;
+    Cp              1004.5;
+    Hf              0;
+    As              1.458e-06;
+    Ts              110.4;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index e30c05b865..29cc46bb60 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -19,12 +19,18 @@ Pr              0.72;
 
 thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
-mixture         N2
-     1 28.01348
-     100 10000 1000
-     2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221
-     3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391
-     1.458e-06 110;
+mixture
+{
+    nMoles          1;
+    molWeight       28.01348;
+    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 );
+    As              1.458e-06;
+    Ts              110;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
index 071a9b2258..cb6bd7a7d6 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
@@ -15,12 +15,20 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType     ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 // Note: these are the properties for a "normalised" inviscid gas
 //       for which the speed of sound is 1 m/s at a temperature of 1K
 //       and gamma = 7/5
-mixture         normalisedGas 1 11640.3 2.5 0 0 1;
+mixture
+{
+    nMoles          1;
+    molWeight       11640.3;
+    Cp              2.5;
+    Hf              0;
+    mu              0;
+    Pr              1;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
index 28dcabbacb..a3fd8e1b4f 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
@@ -17,7 +17,16 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         normalisedGas 1 11640.3 2.5 0 0 1;
+mixture
+{
+    // normalised gas
+    nMoles          1;
+    molWeight       11640.3;
+    Cp              2.5;
+    Hf              0;
+    mu              0;
+    Pr              1;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
index 87220ff980..81103c8d49 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.96 1004.5 2.544e+06 0 1;
+mixture
+{
+    nMoles          1;
+    molWeight       28.96;
+    Cp              1004.5;
+    Hf              2.544e+06;
+    mu              0;
+    Pr              1;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
index 28dcabbacb..a3fd8e1b4f 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
@@ -17,7 +17,16 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         normalisedGas 1 11640.3 2.5 0 0 1;
+mixture
+{
+    // normalised gas
+    nMoles          1;
+    molWeight       11640.3;
+    Cp              2.5;
+    Hf              0;
+    mu              0;
+    Pr              1;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
index 2972c17c4e..697d53b193 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles      1;
+    molWeight   28.9;
+    Cp          1000;
+    Hf          0;
+    mu          1.8e-05;
+    Pr          0.7;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
index 3f8c932b2b..686497a1c7 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1007 0 1.4792e-06 116;
+mixture
+{
+    nMoles      1;
+    molWeight   28.9;
+    Cp          1007;
+    Hf          0;
+    As          1.4792e-06;
+    Ts          116;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
index 9b994f0e6d..c482d50e2a 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1007 0 1.84e-05 0.7;
+mixture
+{
+    nMoles      1;
+    molWeight   28.9;
+    Cp          1007;
+    Hf          0;
+    mu          1.84e-05;
+    Pr          0.7;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
index 3f8c932b2b..d5f758b90b 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1007 0 1.4792e-06 116;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1007;
+    Hf              0;
+    As              1.4792e-06;
+    Ts              116;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
index 4b6d7fef8d..246d366f4f 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1007 0 1.4792e-06 116;
+mixture
+{
+    nMoles      1;
+    molWeight   28.9;
+    Cp          1007;
+    Hf          0;
+    As          1.4792e-06;
+    Ts          116;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
index 3f8c932b2b..686497a1c7 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1007 0 1.4792e-06 116;
+mixture
+{
+    nMoles      1;
+    molWeight   28.9;
+    Cp          1007;
+    Hf          0;
+    As          1.4792e-06;
+    Ts          116;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
index ef759742f1..cb6bd7a7d6 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
@@ -20,7 +20,15 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 // Note: these are the properties for a "normalised" inviscid gas
 //       for which the speed of sound is 1 m/s at a temperature of 1K
 //       and gamma = 7/5
-mixture         normalisedGas 1 11640.31 2.5 0 0 1;
+mixture
+{
+    nMoles          1;
+    molWeight       11640.3;
+    Cp              2.5;
+    Hf              0;
+    mu              0;
+    Pr              1;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
index 11ece50194..841587595f 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 717.5 0 0 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cv              717.5;
+    Hf              0;
+    mu              0;
+    Pr              0.7;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
index b380e7875d..a1476497e6 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 717.5 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cv              717.5;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
index b380e7875d..a1476497e6 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 717.5 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cv              717.5;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
index 800bb57319..9f8c5b0cb5 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
@@ -6,10 +6,9 @@ cd ${0%/*} || exit 1    # run from this directory
 
 application=`getApplication`
 
-compileApplication ../../buoyantPimpleFoam/hotRoom/setHotRoom
 runApplication blockMesh
 cp 0/T.org 0/T
-runApplication setHotRoom
+runApplication setFields
 runApplication $application
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/changeDictionaryDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
similarity index 65%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/changeDictionaryDict
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
index 46b60aa514..6c4da7bc6a 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/changeDictionaryDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  1.6                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,25 +10,28 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
-    object      changeDictionaryDict;
+    object      setFieldsDict;
 }
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
-{
-    boundary
-    {
-        inlet
-        {
-            type            directMappedPatch;
-            offset          ( 0.0495 0 0 );
-            sampleRegion    region0;
-            sampleMode      nearestCell;
-            samplePatch     none;
-        }
-    }
-}
+defaultFieldValues
+(
+    volScalarFieldValue T 300
+);
 
+regions
+(
+    // Set patch values (using ==)
+    boxToFace
+    {
+        box (4.5 -1000 4.5) (5.5 1E-5 5.5);
+
+        fieldValues
+        (
+            volScalarFieldValue T 600
+        );
+    }
+);
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
index 800bb57319..9f8c5b0cb5 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
@@ -6,10 +6,9 @@ cd ${0%/*} || exit 1    # run from this directory
 
 application=`getApplication`
 
-compileApplication ../../buoyantPimpleFoam/hotRoom/setHotRoom
 runApplication blockMesh
 cp 0/T.org 0/T
-runApplication setHotRoom
+runApplication setFields
 runApplication $application
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
new file mode 100644
index 0000000000..6c4da7bc6a
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      setFieldsDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue T 300
+);
+
+regions
+(
+    // Set patch values (using ==)
+    boxToFace
+    {
+        box (4.5 -1000 4.5) (5.5 1E-5 5.5);
+
+        fieldValues
+        (
+            volScalarFieldValue T 600
+        );
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
index 536b51a14e..25243dd42f 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
@@ -6,6 +6,5 @@ cd ${0%/*} || exit 1    # run from this directory
 
 cleanCase
 cp 0/T.org 0/T
-wclean setHotRoom
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
index 3aafa6fd94..31c6c104c4 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
@@ -7,9 +7,8 @@ cd ${0%/*} || exit 1    # run from this directory
 # Get application name
 application=`getApplication`
 
-compileApplication setHotRoom
 runApplication blockMesh
-runApplication setHotRoom
+runApplication setFields
 runApplication $application
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
index 7cf6079e48..6e296ae699 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -17,9 +17,17 @@ FoamFile
 
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
-
 pRef            100000;
 
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/Make/files b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/Make/files
deleted file mode 100644
index afc08f453d..0000000000
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-setHotRoom.C
-
-EXE = $(FOAM_USER_APPBIN)/setHotRoom
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/Make/options b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/Make/options
deleted file mode 100644
index fa15f12452..0000000000
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/Make/options
+++ /dev/null
@@ -1,5 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/createFields.H b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/createFields.H
deleted file mode 100644
index cde21f4cde..0000000000
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/createFields.H
+++ /dev/null
@@ -1,13 +0,0 @@
-    Info<< "Reading field T\n" << endl;
-    volScalarField T
-    (
-        IOobject
-        (
-            "T",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
new file mode 100644
index 0000000000..6c4da7bc6a
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      setFieldsDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue T 300
+);
+
+regions
+(
+    // Set patch values (using ==)
+    boxToFace
+    {
+        box (4.5 -1000 4.5) (5.5 1E-5 5.5);
+
+        fieldValues
+        (
+            volScalarFieldValue T 600
+        );
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index b592ca2d1c..324a33ea6f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.96 1004.4 0 1.831e-05 0.705;
+mixture
+{
+    nMoles          1;
+    molWeight       28.96;
+    Cp              1004.4;
+    Hf              0;
+    mu              1.831e-05;
+    Pr              0.705;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
index cb0be1e6e0..7b90a31601 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
@@ -6,9 +6,8 @@ cd ${0%/*} || exit 1    # run from this directory
 
 application=`getApplication`
 
-compileApplication ../../buoyantPimpleFoam/hotRoom/setHotRoom
 runApplication blockMesh
-runApplication setHotRoom
+runApplication setFields
 runApplication $application
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
index 0378a7f78c..b400070d98 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -17,9 +17,17 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
-
 pRef            100000;
 
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/setFieldsDict
new file mode 100644
index 0000000000..6c4da7bc6a
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/setFieldsDict
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      setFieldsDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue T 300
+);
+
+regions
+(
+    // Set patch values (using ==)
+    boxToFace
+    {
+        box (4.5 -1000 4.5) (5.5 1E-5 5.5);
+
+        fieldValues
+        (
+            volScalarFieldValue T 600
+        );
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
index 928afaeb56..d49a1b712b 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
@@ -25,7 +25,7 @@ boundaryField
         type            MarshakRadiation;
         T               T;
         emissivity      1;
-//        value           uniform 0;
+        value           uniform 0;
     }
 
     fixedWalls
@@ -33,7 +33,7 @@ boundaryField
         type            MarshakRadiation;
         T               T;
         emissivity      1;
-//        value           uniform 0;
+        value           uniform 0;
     }
 
     ceiling
@@ -41,7 +41,7 @@ boundaryField
         type            MarshakRadiation;
         T               T;
         emissivity      1;
- //       value           uniform 0;
+        value           uniform 0;
     }
 
     box
@@ -49,7 +49,7 @@ boundaryField
         type            MarshakRadiation;
         T               T;
         emissivity      1;
-//        value           uniform 0;
+        value           uniform 0;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
index 0378a7f78c..b400070d98 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
@@ -17,9 +17,17 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
-
 pRef            100000;
 
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
index 0378a7f78c..b400070d98 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
@@ -17,9 +17,17 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
-
 pRef            100000;
 
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index 64a74514b8..be6c8895fd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/bottomAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index 64a74514b8..972acfc40c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/topAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index 64a74514b8..be6c8895fd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/bottomAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
index 64a74514b8..972acfc40c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/topAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index 64a74514b8..be6c8895fd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/bottomAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index 64a74514b8..972acfc40c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/topAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
index 02becd019b..a76bbd4dcd 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
@@ -67,6 +67,7 @@ solvers
 
 PIMPLE
 {
+    correctPhi          yes;
     nOuterCorrectors    2;
     nCorrectors         1;
     nNonOrthogonalCorrectors 0;
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U
index 51ef892fb8..f1006ceb5e 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U
@@ -15,46 +15,46 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
-internalField   uniform ( 0 0 0 );
+internalField   uniform (0 0 0);
 
 boundaryField
 {
     inlet
     {
         type            pressureInletOutletVelocity;
-        value           uniform ( 0 0 0 );
+        value           uniform (0 0 0);
     }
     outlet1
     {
         type            inletOutlet;
-        inletValue      uniform ( 0 0 0 );
-        value           uniform ( 0 0 0 );
+        inletValue      uniform (0 0 0);
+        value           uniform (0 0 0);
     }
     outlet2
     {
         type            inletOutlet;
-        inletValue      uniform ( 0 0 0 );
-        value           uniform ( 0 0 0 );
+        inletValue      uniform (0 0 0);
+        value           uniform (0 0 0);
     }
     baffles
     {
         type            fixedValue;
-        value           uniform ( 0 0 0 );
+        value           uniform (0 0 0);
     }
     fan_half0
     {
         type            cyclic;
     }
+    fan_half1
+    {
+        type            cyclic;
+    }
     defaultFaces
     {
         type            fixedValue;
-        value           uniform ( 0 0 0 );
-    }
-    fan_half1
-    {
-        type            cyclic;
+        value           uniform (0 0 0);
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon
index dc1eb9da3e..5c6c53664d 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 1;
 
@@ -42,21 +42,27 @@ boundaryField
     baffles
     {
         type            epsilonWallFunction;
-        value           uniform 1;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
     }
     fan_half0
     {
         type            cyclic;
     }
+    fan_half1
+    {
+        type            cyclic;
+    }
     defaultFaces
     {
         type            epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
         value           uniform 1;
     }
-    fan_half1
-    {
-        type            cyclic;
-    }
 }
 
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k
index 06aeff0f1f..18cb53d519 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1;
 
@@ -42,21 +42,21 @@ boundaryField
     baffles
     {
         type            kqRWallFunction;
-        value           uniform 1;
+        value           uniform 0;
     }
     fan_half0
     {
         type            cyclic;
     }
+    fan_half1
+    {
+        type            cyclic;
+    }
     defaultFaces
     {
         type            kqRWallFunction;
         value           uniform 1;
     }
-    fan_half1
-    {
-        type            cyclic;
-    }
 }
 
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
index 699a951041..ffc7ac906f 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -41,14 +41,14 @@ boundaryField
     {
         type            cyclic;
     }
-    defaultFaces
-    {
-        type            zeroGradient;
-    }
     fan_half1
     {
         type            cyclic;
     }
+    defaultFaces
+    {
+        type            zeroGradient;
+    }
 }
 
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut
index 1a5afb9689..6ed8f42dfc 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -39,21 +39,27 @@ boundaryField
     baffles
     {
         type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
         value           uniform 0;
     }
     fan_half0
     {
         type            cyclic;
     }
-    defaultFaces
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
     fan_half1
     {
         type            cyclic;
     }
+    defaultFaces
+    {
+        type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
 }
 
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p
index c77ad85725..66f5c1d712 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 100000;
 
@@ -24,14 +24,12 @@ boundaryField
     inlet
     {
         type            timeVaryingTotalPressure;
-        p0              100040;
-        outOfBounds     clamp;
-        fileName        "$FOAM_CASE/constant/p0vsTime";
-        U               U;
-        phi             phi;
         rho             none;
         psi             none;
         gamma           1;
+        p0              100040;
+        fileName        "$FOAM_CASE/constant/p0vsTime";
+        outOfBounds     clamp;
         value           uniform 100040;
     }
     outlet1
@@ -52,19 +50,19 @@ boundaryField
     {
         type            fan;
         patchType       cyclic;
-        f               2 ( 50 -0.1 );
-        value           $internalField;
-    }
-    defaultFaces
-    {
-        type            zeroGradient;
+        f               2(100 -0.1);
+        value           uniform 0;
     }
     fan_half1
     {
         type            fan;
         patchType       cyclic;
-        f               2 ( 50 -0.1 );
-        value           $internalField;
+        f               2(100 -0.1);
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            zeroGradient;
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/controlDict
index 9dc31d5561..63b2669008 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/controlDict
@@ -28,7 +28,6 @@ endTime         1;
 deltaT          0.001;
 
 writeControl    adjustableRunTime;
-
 writeInterval   0.1;
 
 purgeWrite      0;
@@ -47,7 +46,7 @@ runTimeModifiable true;
 
 adjustTimeStep  yes;
 
-maxCo           5;
+maxCo           3;
 
 libs
 (
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
deleted file mode 100755
index 5cf2386bfa..0000000000
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name
-application=`getApplication`
-
-runApplication blockMesh
-runApplication changeDictionary
-runApplication $application
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict
index 37b146f399..d01e8f86f7 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict
@@ -85,69 +85,90 @@ edges
 (
 );
 
-patches         
+boundary
 (
-    patch inlet 
-    (
-        (0 22 23 1)
-        (1 23 24 2)
-        (2 24 25 3)
-    )
-    patch outlet 
-    (
-        (16 17 39 38)
-        (17 18 40 39)
-        (18 19 41 40)
-        (19 20 42 41)
-        (20 21 43 42)
-    )
-    wall upperWall 
-    (
-        (3 25 31 9)
-        (9 31 37 15)
-        (15 37 43 21)
-    )
-    wall lowerWall 
-    (
-        (0 6 28 22)
-        (6 5 27 28)
-        (5 4 26 27)
-        (4 10 32 26)
-        (10 16 38 32)
-    )
-    empty frontAndBack 
-    (
-        (22 28 29 23)
-        (23 29 30 24)
-        (24 30 31 25)
-        (26 32 33 27)
-        (27 33 34 28)
-        (28 34 35 29)
-        (29 35 36 30)
-        (30 36 37 31)
-        (32 38 39 33)
-        (33 39 40 34)
-        (34 40 41 35)
-        (35 41 42 36)
-        (36 42 43 37)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 3 9 8)
-        (4 5 11 10)
-        (5 6 12 11)
-        (6 7 13 12)
-        (7 8 14 13)
-        (8 9 15 14)
-        (10 11 17 16)
-        (11 12 18 17)
-        (12 13 19 18)
-        (13 14 20 19)
-        (14 15 21 20)
-    )
-);
+    inlet 
+    {
+        type directMappedPatch;
+        offset          ( 0.0495 0 0 );
+        sampleRegion    region0;
+        sampleMode      nearestCell;
+        samplePatch     none;
 
-mergePatchPairs
-(
+        faces
+        (
+            (0 22 23 1)
+            (1 23 24 2)
+            (2 24 25 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces 
+        (
+            (16 17 39 38)
+            (17 18 40 39)
+            (18 19 41 40)
+            (19 20 42 41)
+            (20 21 43 42)
+        );
+    }
+    upperWall 
+    {
+        type wall;
+        faces 
+        (
+            (3 25 31 9)
+            (9 31 37 15)
+            (15 37 43 21)
+        );
+    }
+    lowerWall 
+    {
+        type wall;
+        faces
+        (
+            (0 6 28 22)
+            (6 5 27 28)
+            (5 4 26 27)
+            (4 10 32 26)
+            (10 16 38 32)
+        );
+    }
+    frontAndBack 
+    {
+        type empty;
+        faces
+        (
+            (22 28 29 23)
+            (23 29 30 24)
+            (24 30 31 25)
+            (26 32 33 27)
+            (27 33 34 28)
+            (28 34 35 29)
+            (29 35 36 30)
+            (30 36 37 31)
+            (32 38 39 33)
+            (33 39 40 34)
+            (34 40 41 35)
+            (35 41 42 36)
+            (36 42 43 37)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 3 9 8)
+            (4 5 11 10)
+            (5 6 12 11)
+            (6 7 13 12)
+            (7 8 14 13)
+            (8 9 15 14)
+            (10 11 17 16)
+            (11 12 18 17)
+            (12 13 19 18)
+            (13 14 20 19)
+            (14 15 21 20)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary
deleted file mode 100644
index e13323f287..0000000000
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary
+++ /dev/null
@@ -1,63 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-5
-(
-inlet
-{
-    type            directMappedPatch;
-    nFaces          30;
-    startFace       27238;
-    sampleMode      nearestCell;
-    sampleRegion    region0;
-    samplePatch     none;
-    offset          ( 0.0495 0 0 );
-}
-
-outlet
-{
-    type            patch;
-    nFaces          57;
-    startFace       27268;
-}
-
-upperWall
-{
-    type            wall;
-    nFaces          275;
-    startFace       27325;
-}
-
-lowerWall
-{
-    type            wall;
-    nFaces          302;
-    startFace       27600;
-}
-
-frontAndBack
-{
-    type            empty;
-    nFaces          27570;
-    startFace       27902;
-}
-
-)
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index de5c2a8aa7..9506b9d641 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -194,275 +194,7 @@ addLayersControls
     // Per final patch (so not geometry!) the layer information
     layers
     {
-        minZ
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_frt-fairing:001%1
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_windshield:002%2
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rr-wh-rim:005%5
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rr-wh-rim:010%10
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fr-wh-rim:011%11
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fr-wh-brake-disk:012%12
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_frame:016-shadow%13
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-susp:014%14
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-susp:014-shadow%15
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_frame:016%16
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rr-wh-rim:005-shadow%17
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rr-wh-chain-hub:022%22
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rearseat%24
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_frt-fairing%25
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_windshield%26
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_headlights%27
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_driversseat%28
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-body%29
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fuel-tank%30
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_exhaust%31
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rr-wh-rim%32
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fr-mud-guard%33
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fr-wh-rim%34
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fr-wh-brake-disk%35
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fr-brake-caliper%36
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fr-wh-tyre%37
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_hbars%38
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fr-forks%39
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_chain%40
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rr-wh-tyre%41
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_square-dial%42
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_round-dial%43
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_dial-holder%44
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-susp%45
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-brake-lights%46
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-light-bracket%47
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_frame%48
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-mud-guard%49
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-susp-spring-damp%50
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fairing-inner-plate%51
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_clutch-housing%52
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_radiator%53
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_water-pipe%54
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_water-pump%55
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_engine%56
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-shock-link%57
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-brake-fluid-pot-bracket%58
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-brake-fluid-pot%59
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_footpeg%60
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rr-wh-chain-hub%61
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-brake-caliper%62
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rider-helmet%65
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rider-visor%66
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rider-boots%67
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rider-gloves%68
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rider-body%69
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_frame:0%70
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_frt-fairing:001-shadow%74
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_windshield-shadow%75
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fr-mud-guard-shadow%81
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_fr-wh-brake-disk-shadow%83
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-mud-guard-shadow%84
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-susp-spring-damp-shadow%85
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_radiator-shadow%86
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-shock-link-shadow%87
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rear-brake-fluid-pot-bracket-shadow%88
-        {
-            nSurfaceLayers 1;
-        }
-        motorBike_rr-wh-chain-hub-shadow%89
+        "(lowerWall|motorBike).*"
         {
             nSurfaceLayers 1;
         }
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/chem.inp b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/chem.inp
deleted file mode 100644
index 0e2a2580ca..0000000000
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/chem.inp
+++ /dev/null
@@ -1,11 +0,0 @@
-ELEMENTS
-O  H  C  N
-END
-SPECIES
-N2  O2 CH4  H2  CO2 H2O
-END
-REACTIONS
- CH4  + 2   O2 => CO2 + 2 H2O 7.000E+12  0.00  20000
- H2   + 0.5 O2 => H2O         1.500E+14  0.00  20000
-
-END
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat
deleted file mode 100644
index b3a1716ea5..0000000000
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-CO2 CO2	1	44.01
-    0	5000	1000
-    3.85746 0.00441437 -2.21481e-06 5.2349e-10 -4.72084e-14 -48759.2 2.27164
-    2.35677 0.0089846 -7.12356e-06 2.45919e-09 -1.437e-13 -48372 9.90105
-	1.67212e-06	170.672
-CH4 CH4	1	16.043
-    0	5000	1000
-    0.0748515 0.0133909 -5.73286e-06 1.22293e-09 -1.01815e-13 -9468.34 18.4373
-    5.14988 -0.013671 4.91801e-05 -4.84743e-08 1.66694e-11 -10246.6 -4.6413
-	1.67212e-06	170.672
-H2 H2	1	2.01594
-    0	5000	1000
-    3.33728 -4.94025e-05 4.99457e-07 -1.79566e-10 2.00255e-14 -950.159 -3.20502
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-	1.67212e-06	170.672
-H2O H2O	1	18.0153
-    0	5000	1000
-    3.03399 0.00217692 -1.64073e-07 -9.7042e-11 1.68201e-14 -30004.3 4.96677
-    4.19864 -0.00203643 6.5204e-06 -5.48797e-09 1.77198e-12 -30293.7 -0.849032
-	1.67212e-06	170.672
-O2 O2	1	31.9988
-    0	5000	1000
-    3.28254 0.00148309 -7.57967e-07 2.09471e-10 -2.16718e-14 -1088.46 5.45323
-    3.78246 -0.00299673 9.8473e-06 -9.6813e-09 3.24373e-12 -1063.94 3.65768
-	1.67212e-06	170.672
-N2 N2	1	28.0134
-    0	5000	1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44485e-12 -1020.9 3.95037
-	1.67212e-06	170.672
-)
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp
deleted file mode 100644
index 9473b7e8fa..0000000000
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp
+++ /dev/null
@@ -1,22 +0,0 @@
-species
-6
-(
-N2
-O2
-CH4
-H2
-CO2
-H2O
-)
-;
-
-reactions
-2
-(
-irreversibleArrheniusReaction
-    CH4 + 2O2^1.0 = CO2 + 2H2O^1.0
-    (7e+06 0 10063.8)
-irreversibleArrheniusReaction
-    H2 + 0.5O2^1.0 = H2O
-    (4.74342e+12 0 10063.8)
-);
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/therm.dat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/therm.dat
deleted file mode 100644
index 20792659cf..0000000000
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/therm.dat
+++ /dev/null
@@ -1,3283 +0,0 @@
-THERMO ALL
-   200.000  1000.000  5000.000
-(CH2O)3            70590C   3H   6O   3     G  0200.00   4000.00  1500.00      1
- 0.01913678E+03 0.08578044E-01-0.08882060E-05-0.03574819E-08 0.06605143E-12    2
--0.06560876E+06-0.08432507E+03-0.04662286E+02 0.06091547E+00-0.04710536E-03    3
- 0.01968843E-06-0.03563271E-10-0.05665404E+06 0.04525265E+03                   4
-(CH3)2SICH2        61991H   8C   3SI  1     G  0200.00   2500.00  1500.00      1
- 0.01547852E+03 0.01065700E+00-0.01234345E-05-0.01293352E-07 0.02528715E-11    2
--0.06693076E+04-0.05358884E+03 0.02027522E+02 0.04408673E+00-0.03370024E-03    3
- 0.01484466E-06-0.02830898E-10 0.03931454E+05 0.01815821E+03                   4
-AL                 62987AL  1               G  0200.00   5000.00  0600.00      1
- 0.02559589E+02-0.01063224E-02 0.07202828E-06-0.02121105E-09 0.02289429E-13    2
- 0.03890214E+06 0.05234522E+02 0.02736825E+02-0.05912374E-02-0.04033938E-05    3
- 0.02322343E-07-0.01705599E-10 0.03886795E+06 0.04363880E+02                   4
-AL2H6              62987AL  2H   6          G  0200.00   1500.00  0600.00      1
- 0.02634884E+02 0.02135952E+00 0.03154151E-05-0.07684674E-07 0.02335832E-10    2
- 0.08871346E+05 0.09827515E+02-0.06800681E+02 0.05080744E+00 0.01039747E-03    3
--0.01119582E-05 0.08459155E-09 0.01060537E+06 0.05554526E+03                   4
-AL2ME6             62987AL  2C   6H  18     G  0200.00   1500.00  0600.00      1
- 0.01773147E+03 0.04935747E+00 0.01196854E-04-0.01639826E-06 0.04890867E-10    2
--0.03855560E+06-0.05053298E+03-0.07159750E+01 0.01067109E+01 0.02117605E-03    3
--0.02193212E-05 0.01644144E-08-0.03515546E+06 0.03890763E+03                   4
-ALAS               62987AL  1AS  1          G  0200.00   1500.00  0600.00      1
- 0.04790027E+02-0.01908226E-03-0.01983390E-05 0.02239358E-08-0.06904706E-12    2
- 0.05259290E+06 0.03259703E+02 0.05047764E+02-0.06419947E-02-0.01432071E-04    3
- 0.04754391E-07-0.03297621E-10 0.05254264E+06 0.01985206E+02                   4
-ALH                62987AL  1H   1          G  0200.00   5000.00  1000.00      1
- 0.03392644E+02 0.01215399E-01-0.04676595E-05 0.08691625E-09-0.06022669E-13    2
- 0.03006845E+06 0.02758899E+02 0.03071503E+02 0.02165549E-01-0.03275638E-04    3
- 0.04136984E-07-0.01877121E-10 0.03021221E+06 0.04548855E+02                   4
-ALH2               62987AL  1H   2          G  0200.00   1500.00  0600.00      1
- 0.04486543E+02 0.03128832E-01-0.01969438E-05-0.01016030E-07 0.03497468E-11    2
- 0.01960959E+06 0.08167897E+01 0.02442137E+02 0.09915913E-01 0.02471083E-05    3
--0.02119583E-06 0.01710234E-09 0.01997588E+06 0.01065270E+03                   4
-ALH3               62987AL  1H   3          G  0200.00   1500.00  0600.00      1
- 0.04186838E+02 0.06159249E-01-0.03877593E-06-0.02061928E-07 0.06600276E-11    2
- 0.07908079E+05 0.05134396E+01 0.01008323E+02 0.01640324E+00 0.01976746E-04    3
--0.03528558E-06 0.02753378E-09 0.08484656E+05 0.01585838E+03                   4
-ALME               62987AL  1C   1H   3     G  0200.00   1500.00  0600.00      1
- 0.04662737E+02 0.07097939E-01 0.02520013E-05-0.02114863E-07 0.06097489E-11    2
- 0.08203228E+05 0.01769245E+02 0.02664176E+02 0.01324914E+00 0.02525848E-04    3
--0.02394396E-06 0.01761855E-09 0.08574173E+05 0.01147449E+03                   4
-ALME2              62987AL  1C   2H   6     G  0200.00   1500.00  0600.00      1
- 0.06481282E+02 0.01474605E+00 0.05816529E-05-0.04621347E-07 0.01396041E-10    2
- 0.03745072E+05-0.02603326E+02 0.09494573E+01 0.03206354E+00 0.06134021E-04    3
--0.06500042E-06 0.04911485E-09 0.04761408E+05 0.02419465E+03                   4
-ALME3              62987AL  1C   3H   9     G  0200.00   1500.00  0600.00      1
- 0.06654948E+02 0.02455144E+00 0.01176575E-04-0.07815023E-07 0.02255622E-10    2
--0.01340952E+06-0.03454481E+02-0.07027567E+01 0.04682764E+00 0.01149903E-03    3
--0.09160441E-06 0.06687294E-09-0.01203799E+06 0.03232771E+03                   4
-AR                120186AR  1               G  0200.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.07453750E+04 0.04366001E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.07453750E+04 0.04366001E+02                   4
-AR+               121286AR  1E  -1          G  0200.00   5000.00  1000.00      1
- 0.02864864E+02-0.01203573E-02-0.01065199E-06 0.09074839E-10-0.09623876E-14    2
- 0.01827230E+07 0.03543585E+02 0.02301341E+02 0.08035529E-02-0.01758806E-05    3
--0.01781093E-08-0.08937268E-13 0.01829281E+07 0.06659358E+02                   4
-AS                 62987AS  1               G  0200.00   1500.00  0600.00      1
- 0.02617011E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.03720455E+06 0.06995524E+02 0.02617011E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.03720455E+06 0.06995524E+02                   4
-AS2                62987AS  2               G  0200.00   1500.00  0600.00      1
- 0.04394201E+02 0.05389968E-02-0.02379401E-05-0.06541924E-09 0.05184186E-12    2
- 0.02235094E+06 0.04897919E+02 0.03682892E+02 0.03121811E-01-0.01074052E-04    3
--0.05629472E-07 0.05178811E-10 0.02247356E+06 0.08283423E+02                   4
-AS3                62987AS  3               G  0200.00   1500.00  0600.00      1
- 0.07404036E+02 0.07818426E-02-0.03918297E-05-0.05203629E-09 0.06291907E-12    2
- 0.03063825E+06-0.03417324E+02 0.06403142E+02 0.04477099E-01-0.01866642E-04    3
--0.07394750E-07 0.07012753E-10 0.03080965E+06 0.01337136E+02                   4
-AS4                62987AS  4               G  0200.00   1500.00  0600.00      1
- 0.09695766E+02 0.01306258E-01-0.05519564E-05-0.02150874E-08 0.01457935E-11    2
- 0.01571732E+06-0.01618870E+03 0.07853761E+02 0.07916509E-01-0.02329820E-04    3
--0.01526312E-06 0.01377435E-09 0.01603629E+06-0.07409755E+02                   4
-ASALME             62987AS  1AL  1C   1H   3G  0200.00   1500.00  0600.00      1
- 0.07127107E+02 0.07357864E-01 0.02300796E-06-0.02226399E-07 0.06927227E-11    2
- 0.03273438E+06-0.01847179E+02 0.04053423E+02 0.01726125E+00 0.01833498E-04    3
--0.03386953E-06 0.02626981E-09 0.03329309E+06 0.01299665E+03                   4
-ASALME2            62987AS  1AL  1C   2H   6G  0200.00   1500.00  0600.00      1
- 0.09909938E+02 0.01463850E+00 0.04118731E-05-0.04444658E-07 0.01329501E-10    2
- 0.02815111E+06-0.01523531E+03 0.04808530E+02 0.03067687E+00 0.05048001E-04    3
--0.05908099E-06 0.04462290E-09 0.02908817E+06 0.09471621E+02                   4
-ASGAET             62987AS  1GA  1C   2H   5G  0200.00   1500.00  0600.00      1
- 0.09081073E+02 0.01674632E+00 0.01283130E-05-0.05590436E-07 0.01781315E-10    2
- 0.03807443E+06-0.09142782E+02 0.06364698E+01 0.04382467E+00 0.06144686E-04    3
--0.09491641E-06 0.07374198E-09 0.03960893E+06 0.03164673E+03                   4
-ASGAET2            62987AS  1GA  1C   4H  10G  0200.00   1500.00  0600.00      1
- 0.01032429E+03 0.03073571E+00 0.01086335E-04-0.09971949E-07 0.02945979E-10    2
- 0.03039490E+06-0.01316402E+03-0.03539248E+01 0.06369772E+00 0.01359742E-03    3
--0.01286142E-05 0.09572181E-09 0.03236903E+06 0.03865086E+03                   4
-ASGAME             62987AS  1GA  1C   1H   3G  0200.00   1500.00  0600.00      1
- 0.07322183E+02 0.06995479E-01 0.01069351E-05-0.01995283E-07 0.06040446E-11    2
- 0.03949449E+06-0.07416680E+01 0.04877266E+02 0.01482559E+00 0.01652124E-04    3
--0.02712058E-06 0.02080196E-09 0.03994071E+06 0.01107670E+03                   4
-ASGAME2            62987AS  1GA  1C   2H   6G  0200.00   1500.00  0600.00      1
- 0.09352436E+02 0.01504820E+00 0.05157975E-05-0.04553518E-07 0.01348763E-10    2
- 0.03735856E+06-0.01218114E+03 0.04382076E+02 0.03056345E+00 0.05477067E-04    3
--0.05834108E-06 0.04373509E-09 0.03827434E+06 0.01191111E+03                   4
-ASGAMEH            62987AS  1GA  1C   1H   4G  0200.00   1500.00  0600.00      1
- 0.07842794E+02 0.09682097E-01 0.01060306E-05-0.02991402E-07 0.09382673E-11    2
- 0.04435297E+06-0.05093455E+02 0.03585119E+02 0.02336317E+00 0.02873356E-04    3
--0.04737895E-06 0.03674461E-09 0.04512703E+06 0.01547160E+03                   4
-ASH                62987AS  1H   1          G  0200.00   1500.00  0600.00      1
- 0.03219848E+02 0.01001250E-01-0.04874997E-08-0.01107653E-08-0.09254321E-13    2
- 0.03008176E+06 0.06647311E+02 0.03865843E+02-0.01157571E-01-0.03494372E-05    3
- 0.07079686E-07-0.06014028E-10 0.02996829E+06 0.03549869E+02                   4
-ASH2               62987AS  1H   2          G  0200.00   1500.00  0600.00      1
- 0.03428307E+02 0.03181140E-01 0.01460484E-05-0.07937145E-08 0.01694414E-11    2
- 0.02010282E+06 0.02904703E+02 0.03778945E+02 0.01759233E-01 0.08070807E-05    3
- 0.02358763E-07-0.03043521E-10 0.02004862E+06 0.01272974E+02                   4
-ASH3               62987AS  1H   3          G  0200.00   1500.00  0600.00      1
- 0.04172022E+02 0.04371323E-01 0.02177574E-05-0.01183264E-07 0.04536374E-11    2
- 0.06882916E+05 0.02803477E+02 0.09446356E+01 0.01508469E+00 0.01201696E-04    3
--0.03397465E-06 0.02767656E-09 0.07459168E+05 0.01832268E+03                   4
-ASME               62987AS  1C   1H   3     G  0200.00   1500.00  0600.00      1
- 0.04657260E+02 0.06976298E-01 0.02147557E-05-0.02101159E-07 0.06082150E-11    2
- 0.02806423E+06 0.03409835E+02 0.02625270E+02 0.01325242E+00 0.02441628E-04    3
--0.02419567E-06 0.01786944E-09 0.02844080E+06 0.01327336E+03                   4
-ASME2              62987AS  1C   2H   6     G  0200.00   1500.00  0600.00      1
- 0.05981395E+02 0.01521284E+00 0.06993355E-05-0.04721619E-07 0.01369912E-10    2
- 0.01467985E+06 0.01192741E+02 0.01390400E+02 0.02923331E+00 0.06598871E-04    3
--0.05620560E-06 0.04130368E-09 0.01553302E+06 0.02349981E+03                   4
-ASME3              62987AS  1C   3H   9     G  0200.00   1500.00  0600.00      1
- 0.06347764E+02 0.02466454E+00 0.01154629E-04-0.07877436E-07 0.02202225E-10    2
--0.01617323E+05-0.06316786E+01 0.02667388E+01 0.04253171E+00 0.01165106E-03    3
--0.07914706E-06 0.05603127E-09-0.04685540E+04 0.02904591E+03                   4
-BE                 81392BE  1               G  0200.00   5000.00  1000.00      1
- 0.02380618E+02 0.02339856E-02-0.01453949E-05 0.03111727E-09-0.01072959E-13    2
- 0.03868083E+06 0.02787792E+02 0.02403493E+02 0.06166087E-02-0.01321925E-04    3
- 0.01144806E-07-0.03437304E-11 0.03864894E+06 0.02549853E+02                   4
-BE(S)              81392BE  1               S  0200.00   3000.00  1000.00      1
- 0.01898768E+02 0.01629382E-01-0.03547406E-05 0.01247349E-08-0.01578507E-12    2
--0.06527011E+04-0.01020412E+03-0.09092963E+01 0.01585668E+00-0.02624182E-03    3
- 0.02044924E-06-0.05872448E-10-0.02390556E+04 0.02598871E+02                   4
-BE2SIO4(S)         81392BE  2O   4SI  1     S  0200.00   3000.00  1000.00      1
- 0.01695617E+03 0.06266472E-01-0.02841325E-04 0.06379149E-08-0.04780890E-12    2
--0.02614324E+07-0.09398438E+03-0.06380159E+02 0.09333352E+00-0.01415477E-02    3
- 0.01101948E-05-0.03462902E-09-0.02558671E+07 0.02162977E+03                   4
-BE3B2O6(S)         81392B   2BE  3O   6     S  0200.00   3000.00  1000.00      1
- 0.02640267E+03 0.01142674E+00-0.03773479E-04 0.04332047E-08 0.02356543E-12    2
--0.03849576E+07-0.01487137E+04-0.05230657E+02 0.01105769E+01-0.01614054E-02    3
- 0.01447797E-05-0.05420786E-09-0.03755957E+07 0.01490974E+03                   4
-BE3N2(A)           81392BE  3N   2          S  0200.00   3000.00  1000.00      1
- 0.01097008E+03 0.06416846E-01-0.02938928E-04 0.04564651E-08-0.05509703E-13    2
--0.07519767E+06-0.06231286E+03-0.08167547E+02 0.08515091E+00-0.01355569E-02    3
- 0.01060406E-05-0.03256815E-09-0.07110460E+06 0.03040606E+03                   4
-BE3N2(L)           81392BE  3N   2          L  0200.00   4000.00  1000.00      1
- 0.01610468E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.06338252E+06-0.08701469E+03 0.01610468E+03 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.06338252E+06-0.08701468E+03                   4
-BEAL2O4(S)         81392AL  2BE  1O   4     S  0200.00   2400.00  1000.00      1
- 0.01118219E+03 0.01677777E+00-0.06692989E-04-0.01497360E-07 0.01203700E-10    2
--0.02810337E+07-0.06116527E+03-0.07257604E+02 0.01074554E+01-0.01713422E-02    3
- 0.01295274E-05-0.03740965E-09-0.02780832E+07 0.02383770E+03                   4
-BEB2O4             81392B   2BE  1O   4     G  0200.00   5000.00  1000.00      1
- 0.01266018E+03 0.06883210E-01-0.02963169E-04 0.05694789E-08-0.04050458E-12    2
--0.01672990E+07-0.03636876E+03 0.04012008E+02 0.03052847E+00-0.02571938E-03    3
- 0.09738810E-07-0.01450712E-10-0.01648983E+07 0.08399628E+02                   4
-BEBO2              81392B   1BE  1O   2     G  0200.00   5000.00  1000.00      1
- 0.06831273E+02 0.03424464E-01-0.01471236E-04 0.02825118E-08-0.02008790E-12    2
--0.06047559E+06-0.08730609E+02 0.02426203E+02 0.01572415E+00-0.01309160E-03    3
- 0.04244447E-07-0.02562806E-11-0.05929016E+06 0.01394744E+03                   4
-BEBR               81392BE  1BR  1          G  0200.00   5000.00  1000.00      1
- 0.04166357E+02 0.04424462E-02-0.01713095E-05 0.03185381E-09-0.01964221E-13    2
- 0.01313080E+06 0.03473875E+02 0.03178756E+02 0.03144181E-01-0.01989189E-04    3
--0.04871910E-08 0.06208255E-11 0.01337870E+06 0.08520506E+02                   4
-BEBR2              81392BE  1BR  2          G  0200.00   5000.00  1000.00      1
- 0.06814040E+02 0.07848450E-02-0.03497501E-05 0.06885841E-09-0.04984129E-13    2
--0.02974764E+06-0.06362110E+02 0.05216331E+02 0.05128972E-01-0.03678726E-04    3
- 0.08525872E-09 0.05611721E-11-0.02932967E+06 0.01847829E+02                   4
-BEBR2(S)           81392BE  1BR  2          S  0200.00   1500.00  1000.00      1
- 0.07680161E+02 0.03193456E-01-0.02439097E-05-0.09487536E-08 0.03902210E-11    2
--0.04528092E+06-0.03282152E+03 0.05659917E+02 0.08805599E-01-0.02790316E-04    3
--0.04611400E-07 0.03007373E-10-0.04482571E+06-0.02263852E+03                   4
-BECL               81392BE  1CL  1          G  0200.00   5000.00  1000.00      1
- 0.04072243E+02 0.05328307E-02-0.02146892E-05 0.04097687E-09-0.02774848E-13    2
- 0.05990792E+05 0.02639872E+02 0.03006275E+02 0.03385550E-01-0.02274674E-04    3
--0.01333438E-08 0.04447782E-11 0.06271131E+05 0.08126810E+02                   4
-BECL2              81392BE  1CL  2          G  0200.00   5000.00  1000.00      1
- 0.06656109E+02 0.09583935E-02-0.04248637E-05 0.08333911E-09-0.06016211E-13    2
--0.04547842E+06-0.08159565E+02 0.04835084E+02 0.05899051E-01-0.04307799E-04    3
- 0.03113267E-08 0.05292957E-11-0.04499748E+06 0.01210616E+02                   4
-BECL2(A)           81392BE  1CL  2          S  0200.00   1500.00  1000.00      1
- 0.08380054E+02 0.02572312E-01-0.07554892E-05-0.02368242E-08 0.01042547E-11    2
--0.06177281E+06-0.03886076E+03 0.08074927E+01 0.03830225E+00-0.06255340E-03    3
- 0.04645940E-06-0.01295143E-09-0.06052883E+06-0.03683825E+02                   4
-BECL2(B)           81392BE  1CL  2          S  0200.00   1500.00  1000.00      1
- 0.07791771E+02 0.02945389E-01-0.04237093E-05-0.05339604E-08 0.01505044E-11    2
--0.06231958E+06-0.03656698E+03 0.03004424E+02 0.02353211E+00-0.03553037E-03    3
- 0.02706855E-06-0.08144728E-10-0.06136495E+06-0.01365758E+03                   4
-BECLF              81392BE  1CL  1F   1     G  0200.00   5000.00  1000.00      1
- 0.06393787E+02 0.01234948E-01-0.05412476E-05 0.01053150E-08-0.07557553E-13    2
--0.07104831E+06-0.07478512E+02 0.04405415E+02 0.06642228E-01-0.05154354E-04    3
- 0.01063175E-07 0.02287810E-11-0.07051262E+06 0.02777586E+02                   4
-BEF                81392BE  1F   1          G  0200.00   5000.00  1000.00      1
- 0.03741370E+02 0.08524818E-02-0.03436428E-05 0.06466099E-09-0.04475089E-13    2
--0.02167667E+06 0.02968223E+02 0.02905108E+02 0.02952099E-01-0.02747617E-04    3
- 0.01918800E-07-0.07179964E-11-0.02140972E+06 0.07407617E+02                   4
-BEF2               81392BE  1F   2          G  0200.00   5000.00  1000.00      1
- 0.06008875E+02 0.01636431E-01-0.07094651E-05 0.01370220E-08-0.09780462E-13    2
--0.09777056E+06-0.07723693E+02 0.03801759E+02 0.07737988E-01-0.06427724E-04    3
- 0.02097328E-07-0.01462695E-11-0.09717092E+06 0.03660784E+02                   4
-BEF2(L)            81392BE  1F   2          L  0200.00   2000.00  1000.00      1
- 0.05976585E+02 0.04777009E-01-0.05064131E-05 0.05012404E-09 0.08570416E-13    2
--0.01251277E+07-0.02873833E+03-0.05587355E+01 0.03423905E+00-0.05210078E-03    3
- 0.04099400E-06-0.01226767E-09-0.01239060E+07 0.02162308E+02                   4
-BEH                81392BE  1H   1          G  0200.00   5000.00  1000.00      1
- 0.03103757E+02 0.01443026E-01-0.05486383E-05 0.09992518E-09-0.06823073E-13    2
- 0.03762032E+06 0.03113887E+02 0.03220220E+02 0.01660638E-01-0.03759811E-04    3
- 0.05403578E-07-0.02433378E-10 0.03762484E+06 0.02536116E+02                   4
-BEH+               81392BE  1H   1E  -1     G  0200.00   5000.00  1000.00      1
- 0.02935026E+02 0.01642881E-01-0.06606950E-05 0.01253854E-08-0.08322438E-13    2
- 0.01381605E+07 0.03342443E+02 0.03203174E+02 0.01918095E-01-0.04743515E-04    3
- 0.06392785E-07-0.02736265E-10 0.01380944E+07 0.01849186E+02                   4
-BEH2               81392BE  1H   2          G  0200.00   5000.00  1000.00      1
- 0.03274395E+02 0.04312822E-01-0.01774785E-04 0.03298131E-08-0.02286391E-12    2
- 0.01367913E+06 0.03758700E+01 0.01761472E+02 0.08827701E-01-0.01241923E-03    3
- 0.01412574E-06-0.06176309E-10 0.01426447E+06 0.08573833E+02                   4
-BEH2O2             81392BE  1H   2O   2     G  0200.00   5000.00  1000.00      1
- 0.07694718E+02 0.04893975E-01-0.01780895E-04 0.03055611E-08-0.02009121E-12    2
--0.08403520E+06-0.01751820E+03 0.03118833E+02 0.01997183E+00-0.01673101E-03    3
- 0.03275766E-07 0.01457848E-10-0.08305301E+06 0.05128545E+02                   4
-BEH2O2(A)          81392BE  1H   2O   2     S  0200.00   1000.00  1000.00      1
- 0.01357669E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01138925E+07-0.07369071E+03-0.07121292E+02 0.08378375E+00-0.01435144E-02    3
- 0.01164084E-05-0.03597983E-09-0.01091544E+07 0.02745148E+03                   4
-BEH2O2(B)          81392BE  1H   2O   2     S  0200.00   1000.00  1000.00      1
- 0.01357669E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01142447E+07-0.07409333E+03-0.07121292E+02 0.08378375E+00-0.01435144E-02    3
- 0.01164084E-05-0.03597983E-09-0.01095066E+07 0.02704887E+03                   4
-BEI                81392BE  1I   1          G  0200.00   5000.00  1000.00      1
- 0.04226574E+02 0.03948427E-02-0.01549696E-05 0.03023851E-09-0.01932301E-13    2
- 0.01912832E+06 0.04229493E+02 0.03358791E+02 0.02864276E-01-0.01889889E-04    3
--0.04370942E-08 0.05986692E-11 0.01933641E+06 0.08627578E+02                   4
-BEI2               81392BE  1I   2          G  0200.00   5000.00  1000.00      1
- 0.06974217E+02 0.06094573E-02-0.02739783E-05 0.05428767E-09-0.03948833E-13    2
--0.09890086E+05-0.05063732E+02 0.05564008E+02 0.04472664E-01-0.03090745E-04    3
--0.02609722E-08 0.06750777E-11-0.09529549E+05 0.02158152E+02                   4
-BEI2(S)            81392BE  1I   2          S  0200.00   1500.00  1000.00      1
- 0.08868316E+02 0.02591978E-01-0.07796846E-05-0.02236952E-08 0.01016032E-11    2
--0.02556556E+06-0.03709859E+03 0.01301872E+02 0.03830115E+00-0.06255080E-03    3
- 0.04645675E-06-0.01295046E-09-0.02432303E+06-0.01952190E+02                   4
-BEN                81392BE  1N   1          G  0200.00   5000.00  1000.00      1
- 0.03799137E+02 0.08135072E-02-0.03271826E-05 0.06267597E-09-0.04443547E-13    2
- 0.05006582E+06 0.03013958E+02 0.02880282E+02 0.03157848E-01-0.02749300E-04    3
- 0.01549304E-07-0.04944407E-11 0.05034622E+06 0.07854857E+02                   4
-BEO(A)             81392BE  1O   1          S  0200.00   3500.00  1000.00      1
- 0.04606101E+02 0.01465013E-01-0.09316989E-06-0.08839902E-09 0.01840163E-12    2
--0.07492927E+06-0.02579358E+03-0.01187545E+01 0.01231168E+00-0.02298405E-04    3
--0.09318502E-07 0.05331928E-10-0.07364786E+06-0.01151163E+02                   4
-BEO(B)             81392BE  1O   1          S  0200.00   3500.00  1000.00      1
- 0.04606101E+02 0.01465013E-01-0.09316989E-06-0.08839902E-09 0.01840163E-12    2
--0.07412403E+06-0.02545418E+03-0.01187545E+01 0.01231168E+00-0.02298405E-04    3
--0.09318502E-07 0.05331928E-10-0.07284262E+06-0.08117651E+01                   4
-BEOH               81392BE  1H   1O   1     G  0200.00   5000.00  1000.00      1
- 0.04580703E+02 0.02444079E-01-0.08794693E-05 0.01484750E-08-0.09530468E-13    2
--0.01534682E+06-0.01819725E+02 0.02577868E+02 0.08977628E-01-0.07867956E-04    3
- 0.02536139E-07 0.06057864E-12-0.01489220E+06 0.08162645E+02                   4
-BES(S)             81392BE  1S   1          S  0200.00   3000.00  1000.00      1
- 0.04944107E+02 0.03098929E-01-0.01308985E-04 0.02564670E-08-0.01377673E-12    2
--0.03004408E+06-0.02521191E+03-0.03045166E+02 0.03934537E+00-0.06572406E-03    3
- 0.05230436E-06-0.01590377E-09-0.02854032E+06 0.01256033E+03                   4
-BESO4(A)           81392BE  1O   4S   1     S  0200.00   2200.00  1000.00      1
- 0.02081235E+01 0.03035540E+00-0.07769396E-04-0.02942517E-07 0.01112249E-10    2
--0.01455278E+07 0.02609183E+01-0.08960041E+02 0.01179726E+01-0.02438390E-02    3
- 0.02430177E-05-0.08722741E-09-0.01453005E+07 0.03410812E+03                   4
-BESO4(B)           81392BE  1O   4S   1     S  0200.00   2200.00  1000.00      1
- 0.02081235E+01 0.03035540E+00-0.07769396E-04-0.02942517E-07 0.01112249E-10    2
--0.01453939E+07 0.04157230E+01-0.08960041E+02 0.01179726E+01-0.02438390E-02    3
- 0.02430177E-05-0.08722741E-09-0.01451667E+07 0.03426292E+03                   4
-BESO4(GAM)         81392BE  1O   4S   1     S  0200.00   2200.00  1000.00      1
- 0.02081235E+01 0.03035540E+00-0.07769396E-04-0.02942517E-07 0.01112249E-10    2
--0.01430422E+07 0.03005051E+02-0.08960041E+02 0.01179726E+01-0.02438390E-02    3
- 0.02430177E-05-0.08722741E-09-0.01428148E+07 0.03685225E+03                   4
-C                 121086C   1               G  0200.00   5000.00  1000.00      1
- 0.02602087E+02-0.01787081E-02 0.09087041E-06-0.01149933E-09 0.03310844E-14    2
- 0.08542154E+06 0.04195177E+02 0.02498585E+02 0.08085777E-03-0.02697697E-05    3
- 0.03040729E-08-0.01106652E-11 0.08545878E+06 0.04753459E+02                   4
-C(S)              121286C   1               S  0200.00   5000.00  1000.00      1
- 0.01490166E+02 0.01662126E-01-0.06687204E-05 0.01290880E-08-0.09205334E-13    2
--0.07074019E+04-0.08717785E+02-0.06705661E+01 0.07181500E-01-0.05632921E-04    3
- 0.02142299E-07-0.04168562E-11-0.07339498E+03 0.02601596E+02                   4
-C+                120186C   1E  -1          G  0200.00   5000.00  1000.00      1
- 0.02511827E+02-0.01735978E-03 0.09504268E-07-0.02218852E-10 0.01862189E-14    2
- 0.02166772E+07 0.04286130E+02 0.02595384E+02-0.04068665E-02 0.06892367E-05    3
--0.05266488E-08 0.01508338E-11 0.02166628E+07 0.03895730E+02                   4
-C-                121686C   1E   1          G  0200.00   5000.00  1000.00      1
- 0.02990221E+02-0.09184596E-02 0.05055560E-05-0.07703410E-09 0.03163271E-13    2
- 0.06983931E+06 0.01259453E+02 0.02783903E+02-0.01774288E-01 0.03696761E-04    3
--0.03066693E-07 0.08637622E-11 0.06998511E+06 0.02726281E+02                   4
-C2                121286C   2               G  0200.00   5000.00  1000.00      1
- 0.04135979E+02 0.06531618E-03 0.01837099E-05-0.05295085E-09 0.04712137E-13    2
- 0.09967272E+06 0.07472923E+01 0.06996045E+02-0.07400602E-01 0.03234704E-04    3
- 0.04802535E-07-0.03295918E-10 0.09897487E+06-0.01386227E+03                   4
-C2-               121286C   2E   1          G  0200.00   5000.00  1000.00      1
- 0.03796891E+02 0.02530050E-02 0.09709118E-06-0.01614804E-09-0.03212893E-15    2
- 0.05207981E+06 0.01658147E+02 0.03468012E+02-0.02352875E-02 0.01243912E-04    3
- 0.04705961E-08-0.08164274E-11 0.05231215E+06 0.03886699E+02                   4
-C2CL3              40992C   2CL  3          G  0200.00   4000.00  1500.00      1
- 0.01183853E+03 0.09460851E-02-0.02920870E-05 0.03847024E-09-0.01539560E-13    2
- 0.02313143E+06-0.02891445E+03 0.04808647E+02 0.02212948E+00-0.02548847E-03    3
- 0.01372083E-06-0.02812663E-10 0.02514353E+06 0.07232629E+02                   4
-C2CL5              40992C   2CL  5          G  0200.00   4000.00  1500.00      1
- 0.01775107E+03 0.09220800E-02-0.04852694E-05 0.01190373E-08-0.01100446E-12    2
--0.02402768E+05-0.05545676E+03 0.06414346E+02 0.03867367E+00-0.04857935E-03    3
- 0.02734513E-06-0.05732891E-10 0.04697039E+04 0.01542036E+02                   4
-C2CL6              40992C   2CL  6          G  0200.00   4000.00  1500.00      1
- 0.02021422E+03 0.01757648E-01-0.05881040E-05 0.08029739E-09-0.03958238E-13    2
--0.02340156E+06-0.07096011E+03 0.07492710E+02 0.04318468E+00-0.05275048E-03    3
- 0.02947143E-06-0.06176554E-10-0.02006555E+06-0.06635582E+02                   4
-C2F6               82489C   2F   6          G  0200.00   5000.00  1000.00      1
- 0.01602057E+03 0.06273007E-01-0.02797778E-04 0.05517547E-08-0.04004651E-12    2
--0.01675654E+07-0.05519459E+03 0.03577448E+02 0.03913670E+00-0.02714862E-03    3
- 0.04348459E-08 0.04007135E-10-0.01642174E+07 0.09098384E+02                   4
-C2H                81193C   2H   1          G  0200.00   4000.00  1000.00      1
- 0.03986367E+02 0.03143123E-01-0.01267243E-04 0.02924363E-08-0.02716320E-12    2
- 0.06655884E+06 0.01191063E+02 0.02737704E+02 0.08048446E-01-0.09244310E-04    3
- 0.06525259E-07-0.01939580E-10 0.06683813E+06 0.07300220E+02                   4
-C2H2              121386C   2H   2          G  0200.00   5000.00  1000.00      1
- 0.04436770E+02 0.05376039E-01-0.01912817E-04 0.03286379E-08-0.02156710E-12    2
- 0.02566766E+06-0.02800338E+02 0.02013562E+02 0.01519045E+00-0.01616319E-03    3
- 0.09078992E-07-0.01912746E-10 0.02612444E+06 0.08805378E+02                   4
-C2H3               12787C   2H   3          G  0200.00   5000.00  1000.00      1
- 0.05933468E+02 0.04017746E-01-0.03966740E-05-0.01441267E-08 0.02378644E-12    2
- 0.03185435E+06-0.08530313E+02 0.02459276E+02 0.07371476E-01 0.02109873E-04    3
--0.01321642E-07-0.01184784E-10 0.03335225E+06 0.01155620E+03                   4
-C2H4              121286C   2H   4          G  0200.00   5000.00  1000.00      1
- 0.03528419E+02 0.01148518E+00-0.04418385E-04 0.07844601E-08-0.05266848E-12    2
- 0.04428289E+05 0.02230389E+02-0.08614880E+01 0.02796163E+00-0.03388677E-03    3
- 0.02785152E-06-0.09737879E-10 0.05573046E+05 0.02421149E+03                   4
-C2H5               12387C   2H   5          G  0200.00   5000.00  1000.00      1
- 0.07190480E+02 0.06484077E-01-0.06428065E-05-0.02347879E-08 0.03880877E-12    2
- 0.01067455E+06-0.01478089E+03 0.02690702E+02 0.08719133E-01 0.04419839E-04    3
- 0.09338703E-08-0.03927773E-10 0.01287040E+06 0.01213820E+03                   4
-C2H6              121686C   2H   6          G  0200.00   4000.00  1000.00      1
- 0.04825938E+02 0.01384043E+00-0.04557259E-04 0.06724967E-08-0.03598161E-12    2
--0.01271779E+06-0.05239507E+02 0.01462539E+02 0.01549467E+00 0.05780507E-04    3
--0.01257832E-06 0.04586267E-10-0.01123918E+06 0.01443229E+03                   4
-C2HCL             112989C   2H   1CL  1     G  0200.00   5000.00  1000.00      1
- 0.06295372E+02 0.03883113E-01-0.01506049E-04 0.02700003E-08-0.01830213E-12    2
- 0.02357279E+06-0.08137063E+02 0.03618443E+02 0.01331979E+00-0.01321822E-03    3
- 0.06092024E-07-0.08879026E-11 0.02415385E+06 0.05050645E+02                   4
-C2HCL5             40992H   1C   2CL  5     G  0200.00   4000.00  1500.00      1
- 0.01897802E+03 0.02244275E-01-0.05864788E-05 0.02733950E-09 0.04934135E-13    2
--0.02494887E+06-0.06578714E+03 0.05356044E+02 0.04176390E+00-0.04710787E-03    3
- 0.02550758E-06-0.05324478E-10-0.02079330E+06 0.04970258E+02                   4
-C2N               121286C   2N   1          G  0200.00   5000.00  1000.00      1
- 0.06151561E+02 0.01511650E-01-0.06629362E-05 0.01286148E-08-0.09160830E-13    2
- 0.06484318E+06-0.08177850E+02 0.03498544E+02 0.08554433E-01-0.06288697E-04    3
- 0.08638478E-08 0.04915996E-11 0.06556611E+06 0.05548374E+02                   4
-C2N2              121286C   2N   2          G  0200.00   5000.00  1000.00      1
- 0.06548003E+02 0.03984707E-01-0.01634216E-04 0.03038597E-08-0.02111069E-12    2
- 0.03490716E+06-0.09735790E+02 0.04265459E+02 0.01192257E+00-0.01342014E-03    3
- 0.09192297E-07-0.02778942E-10 0.03547888E+06 0.01713212E+02                   4
-C2O               121286C   2O   1          G  0200.00   5000.00  1000.00      1
- 0.04849809E+02 0.02947585E-01-0.01090729E-04 0.01792562E-08-0.01115758E-12    2
- 0.03282055E+06-0.06453226E+01 0.03368851E+02 0.08241803E-01-0.08765145E-04    3
- 0.05569262E-07-0.01540009E-10 0.03317081E+06 0.06713314E+02                   4
-C3                121286C   3               G  0200.00   5000.00  1000.00      1
- 0.03803710E+02 0.02253567E-01-0.07704535E-05 0.01316294E-08-0.08694264E-13    2
- 0.09736135E+06 0.06128063E+02 0.04345528E+02 0.01264466E-01-0.04652557E-04    3
- 0.08695856E-07-0.04243536E-10 0.09731403E+06 0.03519437E+02                   4
-C3H2              102193H   2C   3          G  0150.00   4000.00  1000.00      1
- 0.07670981E+02 0.02748749E-01-0.04370943E-05-0.06455599E-09 0.01663887E-12    2
- 0.06259722E+06-0.01236890E+03 0.03166714E+02 0.02482572E+00-0.04591637E-03    3
- 0.04268019E-06-0.01482152E-09 0.06350421E+06 0.08869446E+02                   4
-C3H2(S)           101993H   2C   3          G  0200.00   4000.00  1400.00      1
- 0.08351312E+02 0.02672278E-01-0.02129404E-05-0.01478218E-08 0.02583689E-12    2
- 0.06800690E+06-0.01950884E+03 0.04749475E+02 0.08520229E-01-0.01160268E-04    3
--0.02494954E-07 0.09921004E-11 0.06939979E+06 0.05437792E+01                   4
-C3H4              101993H   4C   3          G  0200.00   4000.00  1400.00      1
- 0.09776256E+02 0.05302138E-01-0.03701118E-05-0.03026386E-08 0.05089581E-12    2
- 0.01954972E+06-0.03077061E+03 0.02539831E+02 0.01633437E+00-0.01764950E-04    3
--0.04647365E-07 0.01729131E-10 0.02251243E+06 0.09935702E+02                   4
-C3H4C             101993H   4C   3          G  0200.00   4000.00  1400.00      1
- 0.09708652E+02 0.05344939E-01-0.03953553E-05-0.03111764E-08 0.05369406E-12    2
- 0.02967722E+06-0.03073273E+03 0.01056162E+02 0.01905236E+00-0.02317048E-04    3
--0.05933690E-07 0.02307128E-10 0.03309110E+06 0.01761927E+03                   4
-C3H4P             101993H   4C   3          G  0200.00   4000.00  1400.00      1
- 0.09768102E+02 0.05219151E-01-0.03753140E-05-0.02992191E-08 0.05107878E-12    2
- 0.01860277E+06-0.03020678E+03 0.03029730E+02 0.01498961E+00-0.01398500E-04    3
--0.03969619E-07 0.01388217E-10 0.02148408E+06 0.08004594E+02                   4
-C3H6              120186C   3H   6          G  0200.00   5000.00  1000.00      1
- 0.06732257E+02 0.01490834E+00-0.04949899E-04 0.07212022E-08-0.03766204E-12    2
--0.09235703E+04-0.01331335E+03 0.01493307E+02 0.02092518E+00 0.04486794E-04    3
--0.01668912E-06 0.07158146E-10 0.01074826E+05 0.01614534E+03                   4
-C3H8              120186C   3H   8          G  0200.00   5000.00  1000.00      1
- 0.07525217E+02 0.01889034E+00-0.06283924E-04 0.09179373E-08-0.04812410E-12    2
--0.01646455E+06-0.01784390E+03 0.08969208E+01 0.02668986E+00 0.05431425E-04    3
--0.02126001E-06 0.09243330E-10-0.01395492E+06 0.01935533E+03                   4
-C3O2              121286C   3O   2          G  0200.00   5000.00  1000.00      1
- 0.08098897E+02 0.05560040E-01-0.02312265E-04 0.04340709E-08-0.03036387E-12    2
--0.01421435E+06-0.01521974E+03 0.04018127E+02 0.01836661E+00-0.01907148E-03    3
- 0.01185587E-06-0.03418748E-10-0.01312824E+06 0.05582084E+02                   4
-C4                121286C   4               G  0200.00   5000.00  1000.00      1
- 0.06500180E+02 0.04228632E-01-0.01790718E-04 0.03404813E-08-0.02403978E-12    2
- 0.01143401E+07-0.01148889E+03 0.02343028E+02 0.01642981E+00-0.01527986E-03    3
- 0.07343826E-07-0.01582274E-10 0.01154538E+07 0.09826204E+02                   4
-C4H               121686C   4H   1          G  0200.00   5000.00  1000.00      1
- 0.06242882E+02 0.06193683E-01-0.02085932E-04 0.03082203E-08-0.01636483E-12    2
- 0.07568019E+06-0.07210806E+02 0.05023247E+02 0.07092375E-01-0.06073762E-07    3
--0.02275752E-07 0.08086994E-11 0.07623813E+06-0.06942594E+00                   4
-C4H10              62090C   4H  10          G  0200.00   4000.00  1500.00      1
- 0.01998785E+03 0.01037281E+00-0.09610818E-05-0.04623018E-08 0.08202828E-12    2
--0.02625571E+06-0.08837907E+03-0.02256618E+02 0.05881732E+00-0.04525783E-03    3
- 0.02037115E-06-0.04079458E-10-0.01760233E+06 0.03329595E+03                   4
-C4H2              121686C   4H   2          G  0200.00   5000.00  1000.00      1
- 0.09031407E+02 0.06047253E-01-0.01948789E-04 0.02754863E-08-0.01385608E-12    2
- 0.05294736E+06-0.02385068E+03 0.04005192E+02 0.01981000E+00-0.09865877E-04    3
--0.06635158E-07 0.06077413E-10 0.05424065E+06 0.01845737E+02                   4
-C4H6              120186C   4H   6          G  0200.00   5000.00  1000.00      1
- 0.08046583E+02 0.01648525E+00-0.05522227E-04 0.08123593E-08-0.04295078E-12    2
- 0.01370130E+06-0.01800458E+03 0.03197108E+02 0.02025592E+00 0.06510192E-04    3
--0.01658442E-06 0.06400282E-10 0.01571520E+06 0.09895660E+02                   4
-C4H8              120386C   4H   8          G  0200.00   5000.00  1000.00      1
- 0.02053584E+02 0.03435051E+00-0.01588320E-03 0.03308966E-07-0.02536104E-11    2
--0.02139723E+05 0.01554320E+03 0.01181138E+02 0.03085338E+00 0.05086525E-04    3
--0.02465489E-06 0.01111019E-09-0.01790400E+05 0.02106247E+03                   4
-C5                121286C   5               G  0200.00   5000.00  1000.00      1
- 0.08078081E+02 0.05743464E-01-0.02436405E-04 0.04638916E-08-0.03278910E-12    2
- 0.01147022E+07-0.01953024E+03 0.02115274E+02 0.02326332E+00-0.02109499E-03    3
- 0.09072734E-07-0.01540093E-10 0.01162738E+07 0.01097603E+03                   4
-C5H                20387C   5H   1          G  0200.00   5000.00  1000.00      1
- 0.08695749E+02 0.06054301E-01-0.02016011E-04 0.02892893E-08-0.01470100E-12    2
- 0.09031069E+06-0.02101595E+03 0.01634825E+02 0.02509538E+00-0.01206636E-03    3
--0.01046511E-06 0.08809988E-10 0.09212488E+06 0.01512194E+03                   4
-C5H12              20387C   5H  12          G  0200.00   4000.00  1000.00      1
- 0.01667798E+03 0.02114483E+00-0.03533321E-04-0.05742202E-08 0.01515948E-11    2
--0.02553670E+06-0.06372940E+03 0.01877908E+02 0.04121646E+00 0.01253234E-03    3
--0.03701537E-06 0.01525569E-09-0.02003816E+06 0.01877257E+03                   4
-C5H2               20587C   5H   2          G  0200.00   5000.00  1000.00      1
- 0.01132917E+03 0.07424057E-01-0.02628189E-04 0.04082541E-08-0.02301333E-12    2
- 0.07878706E+06-0.03617117E+03 0.03062322E+02 0.02709998E+00-0.01009170E-03    3
--0.01272745E-06 0.09167219E-10 0.08114969E+06 0.07071078E+02                   4
-C5H5              101993H   5C   5          G  0200.00   4000.00  1400.00      1
- 0.01531094E+03 0.07473806E-01-0.05837458E-05-0.04386651E-08 0.07696839E-12    2
- 0.02525890E+06-0.05951593E+03 0.01007316E+02 0.03189880E+00-0.04748189E-04    3
--0.01102390E-06 0.04584681E-10 0.03047390E+06 0.01934168E+03                   4
-C5H6               20387C   5H   6          G  0200.00   5000.00  1000.00      1
- 0.09689815E+02 0.01838262E+00-0.06264884E-04 0.09393377E-08-0.05087708E-12    2
- 0.01102124E+06-0.03122908E+03-0.03196739E+02 0.04081361E+00 0.06816505E-05    3
--0.03137459E-06 0.01577223E-09 0.01529068E+06 0.03869939E+03                   4
-C6H               121686C   6H   1          G  0200.00   5000.00  1000.00      1
- 0.01158735E+03 0.07295363E-01-0.02466008E-04 0.03407046E-08-0.01498185E-12    2
- 0.01031448E+07-0.03172578E+03 0.04769848E+02 0.02457279E+00-0.07561252E-04    3
--0.01480691E-06 0.09768054E-10 0.01048523E+07 0.03241530E+02                   4
-C6H10              20387C   6H  10          G  0200.00   5000.00  1000.00      1
- 0.01592777E+03 0.02374413E+00-0.06908672E-04 0.08109777E-08-0.02683123E-12    2
--0.08642656E+05-0.06525186E+03-0.01394228E+02 0.04720693E+00 0.01196042E-03    3
--0.04162896E-06 0.01740336E-09-0.02217790E+05 0.03129604E+03                   4
-C6H14              20387C   6H  14          G  0200.00   4000.00  1000.00      1
- 0.02280472E+03 0.02097989E+00-0.03530674E-04-0.05466245E-08 0.01478950E-11    2
--0.03073757E+06-0.09583162E+03 0.01836174E+02 0.05098461E+00 0.01259586E-03    3
--0.04428362E-06 0.01872237E-09-0.02292750E+06 0.02088145E+03                   4
-C6H2              121686C   6H   2          G  0200.00   5000.00  1000.00      1
- 0.01275652E+03 0.08034381E-01-0.02618215E-04 0.03725060E-08-0.01878851E-12    2
- 0.08075469E+06-0.04041263E+03 0.05751085E+02 0.02636720E+00-0.01166760E-03    3
--0.01071450E-06 0.08790297E-10 0.08262013E+06-0.04335532E+02                   4
-C6H3               20387C   6H   3          G  0200.00   5000.00  1000.00      1
- 0.01276118E+03 0.01038557E+00-0.03479193E-04 0.05109733E-08-0.02690965E-12    2
- 0.07477706E+06-0.03891745E+03 0.05007090E+02 0.02692852E+00-0.05919866E-04    3
--0.01527233E-06 0.09408310E-10 0.07713200E+06 0.02225621E+02                   4
-C6H4              111293H   4C   6          G  0200.00   4000.00  1000.00      1
- 0.01401625E+03 0.08242769E-01-0.08099664E-05-0.04654132E-08 0.08748122E-12    2
- 0.04410396E+06-0.05139376E+03 0.01520024E+02 0.02876611E+00 0.01417725E-04    3
--0.01650589E-06 0.05873157E-10 0.04844894E+06 0.01719034E+03                   4
-C6H5               82489C   6H   5          G  0200.00   4000.00  1000.00      1
- 0.01577589E+03 0.09651109E-01-0.09429416E-05-0.05469111E-08 0.01026522E-11    2
- 0.03302698E+06-0.06176280E+03 0.01143557E+01 0.03627325E+00 0.01158286E-04    3
--0.02196965E-06 0.08463556E-10 0.03836054E+06 0.02380117E+03                   4
-C6H5(L)            82489C   6H   5          G  0200.00   4000.00  1000.00      1
- 0.01721540E+03 0.08621068E-01-0.08221340E-05-0.04752164E-08 0.08844086E-12    2
- 0.06385819E+06-0.06139128E+03 0.04854269E+02 0.03031659E+00 0.01742893E-05    3
--0.01811010E-06 0.07392511E-10 0.06798734E+06 0.05854935E+02                   4
-C6H5O              82489C   6H   5O   1     G  0200.00   4000.00  1000.00      1
- 0.01822639E+03 0.01003985E+00-0.09915668E-05-0.05672804E-08 0.01068372E-11    2
--0.02620846E+05-0.07361391E+03 0.01107497E+02 0.03956946E+00 0.08497295E-05    3
--0.02436311E-06 0.09650660E-10 0.03159672E+05 0.01973496E+03                   4
-C6H5OH             82489C   6H   6O   1     G  0200.00   4000.00  1000.00      1
- 0.01821633E+03 0.01142427E+00-0.01096684E-04-0.06427442E-08 0.01198893E-11    2
--0.02053664E+06-0.07304234E+03 0.01391456E+02 0.03931958E+00 0.01777096E-04    3
--0.02277673E-06 0.08309659E-10-0.01472181E+06 0.01917813E+03                   4
-C6H6               20387C   6H   6          G  0200.00   5000.00  1000.00      1
- 0.01291074E+03 0.01723297E+00-0.05024211E-04 0.05893497E-08-0.01947521E-12    2
- 0.03664512E+05-0.05002699E+03-0.03138012E+02 0.04723103E+00-0.02962208E-04    3
--0.03262819E-06 0.01718692E-09 0.08890031E+05 0.03657573E+03                   4
-C6H7               82489C   6H   7          G  0200.00   4000.00  1000.00      1
- 0.01755221E+03 0.01227080E+00-0.01185742E-04-0.06959661E-08 0.01301326E-11    2
- 0.01624581E+06-0.07166589E+03 0.04639166E+01 0.03975928E+00 0.02529095E-04    3
--0.02223792E-06 0.07557053E-10 0.02225169E+06 0.02235387E+03                   4
-C8H               121686C   8H   1          G  0200.00   5000.00  1000.00      1
- 0.01474991E+03 0.09931501E-01-0.03374841E-04 0.04687593E-08-0.02073536E-12    2
- 0.01399448E+07-0.04892690E+03 0.04489508E+02 0.03521521E+00-0.01019390E-03    3
--0.02197025E-06 0.01421416E-09 0.01425992E+07 0.03996225E+02                   4
-C8H2              121686C   8H   2          G  0200.00   5000.00  1000.00      1
- 0.01568021E+03 0.01115461E+00-0.03724373E-04 0.05197891E-08-0.02375550E-12    2
- 0.01081123E+07-0.05571437E+03 0.04630427E+02 0.03937080E+00-0.01148035E-03    3
--0.02562214E-06 0.01670791E-09 0.01108285E+07 0.08077425E+01                   4
-CA                 80792CA  1               G  0200.00   5000.00  1000.00      1
- 0.01636990E+02 0.01938281E-01-0.01464011E-04 0.04278257E-08-0.03581686E-12    2
- 0.02109799E+06 0.08990615E+02 0.01563120E+02 0.06228361E-01-0.01415732E-03    3
- 0.01323968E-06-0.04370569E-10 0.02092191E+06 0.08370537E+02                   4
-CA(A)              81092CA  1               S  0200.00   1500.00  1000.00      1
- 0.03344424E+02-0.06129555E-04-0.02048549E-05 0.02199575E-08-0.06498067E-12    2
--0.01020624E+05-0.01410880E+03 0.02492826E+02 0.03921280E-01-0.07242436E-04    3
- 0.05919276E-07-0.01802531E-10-0.08641901E+04-0.01010018E+03                   4
-CA(B)              81092CA  1               S  0200.00   2000.00  1000.00      1
- 0.02149662E+02 0.02293734E-01 0.03948384E-05-0.01813978E-08 0.03060995E-12    2
--0.06970589E+04-0.07862350E+02 0.02013343E+02 0.02718935E-01-0.01374494E-05    3
- 0.01528553E-08-0.06023681E-12-0.06613041E+04-0.07168449E+02                   4
-CA(L)              81092CA  1               L  0200.00   3000.00  1000.00      1
- 0.03623553E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.02310016E+04-0.01455354E+03 0.03623553E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.02310016E+04-0.01455354E+03                   4
-CA+                80792CA  1E  -1          G  0200.00   5000.00  1000.00      1
- 0.02415423E+02 0.03140053E-02-0.03458031E-05 0.01350163E-08-0.01342160E-12    2
- 0.09252434E+06 0.05468189E+02 0.02276338E+02 0.01581988E-01-0.03878953E-04    3
- 0.03953701E-07-0.01427856E-10 0.09253536E+06 0.06008258E+02                   4
-CA2                80792CA  2               G  0200.00   5000.00  1000.00      1
- 0.04174798E+02-0.07401838E-02 0.03131196E-05-0.05885577E-09 0.04296578E-13    2
- 0.04052221E+06 0.07582380E+02 0.05604867E+02-0.04044408E-01 0.02454638E-04    3
--0.01495064E-08-0.01724184E-11 0.04008842E+06 0.01167234E+00                   4
-CABR               80792BR  1CA  1          G  0200.00   5000.00  1000.00      1
- 0.04312008E+02 0.04246804E-02-0.02536360E-05 0.07082421E-09-0.05508239E-13    2
--0.07242509E+05 0.05721414E+02 0.04004020E+02 0.01927770E-01-0.02749388E-04    3
- 0.01785012E-07-0.04190442E-11-0.07199987E+05 0.07125700E+02                   4
-CABR2              80792BR  2CA  1          G  0200.00   5000.00  1000.00      1
- 0.07388434E+02 0.01393017E-02-0.06561619E-06 0.01342748E-09-0.09993272E-14    2
--0.04852787E+06-0.04337760E+02 0.06902053E+02 0.01599316E-01-0.01154723E-04    3
--0.02428795E-08 0.03707822E-11-0.04841873E+06-0.01900929E+02                   4
-CABR2(S)           81292BR  2CA  1          S  0200.00   1500.00  1000.00      1
- 0.01076200E+03-0.02979247E-01 0.06950511E-05 0.03569778E-07-0.01382224E-10    2
--0.08542235E+06-0.04524895E+03 0.05478536E+02 0.02209325E+00-0.04544460E-03    3
- 0.04176543E-06-0.01322726E-09-0.08447516E+06-0.02052538E+03                   4
-CACL               80792CA  1CL  1          G  0200.00   5000.00  1000.00      1
- 0.04272197E+02 0.04612770E-02-0.02684554E-05 0.07233022E-09-0.05565813E-13    2
--0.01387933E+06 0.04556153E+02 0.03810549E+02 0.02372144E-01-0.02939380E-04    3
- 0.01528166E-07-0.02396962E-11-0.01379994E+06 0.06742955E+02                   4
-CACL2              80792CA  1CL  2          G  0200.00   5000.00  1000.00      1
- 0.07322969E+02 0.02201546E-02-0.01035664E-05 0.02117574E-09-0.01575201E-13    2
--0.05893953E+06-0.06959426E+02 0.06595983E+02 0.02364235E-01-0.01611807E-04    3
--0.04866457E-08 0.05973912E-11-0.05877467E+06-0.03308009E+02                   4
-CACL2(S)           81092CA  1CL  2          S  0200.00   2000.00  1000.00      1
- 0.06749013E+02 0.03694542E-01-0.02199980E-05 0.01165549E-08-0.02193898E-12    2
--0.09759255E+06-0.02629777E+03 0.05722155E+02 0.01836100E+00-0.03597296E-03    3
- 0.03173054E-06-0.09522563E-10-0.09798464E+06-0.02415730E+03                   4
-CAF                80792CA  1F   1          G  0200.00   5000.00  1000.00      1
- 0.04150489E+02 0.05746086E-02-0.03081448E-05 0.07585468E-09-0.05641270E-13    2
--0.03400290E+06 0.03725193E+02 0.03309446E+02 0.03419155E-01-0.03357208E-04    3
- 0.01004510E-07 0.01112627E-11-0.03382332E+06 0.07876121E+02                   4
-CAF2               80792CA  1F   2          G  0200.00   5000.00  1000.00      1
- 0.06575083E+02 0.05172194E-02-0.02403804E-05 0.04876347E-09-0.03608526E-13    2
--0.09641588E+06-0.04868362E+02 0.05023320E+02 0.04921285E-01-0.03129418E-04    3
--0.01178313E-07 0.01260201E-10-0.09604913E+06 0.02984363E+02                   4
-CAH2O2             81292CA  1H   2O   2     G  0200.00   5000.00  1000.00      1
- 0.08627170E+02 0.03353668E-01-0.01123553E-04 0.01801642E-08-0.01122696E-12    2
--0.07617877E+06-0.01582838E+03 0.05634984E+02 0.01431225E+00-0.01160774E-03    3
- 0.02415328E-08 0.02445194E-10-0.07567777E+06-0.01510141E+02                   4
-CAH2O2(S)          81292CA  1H   2O   2     S  0200.00   1000.00  1000.00      1
- 0.01418556E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01237066E+07-0.07268995E+03-0.07906910E+01 0.06795647E+00-0.01329918E-02    3
- 0.01211862E-05-0.04117456E-09-0.01204396E+07-0.07999789E+01                   4
-CAI                80792CA  1I   1          G  0200.00   5000.00  1000.00      1
- 0.04316128E+02 0.04138589E-02-0.02776385E-05 0.08074141E-09-0.06592826E-13    2
--0.01903879E+05 0.06725163E+02 0.04078205E+02 0.01812968E-01-0.02972846E-04    3
- 0.02225520E-07-0.06173497E-11-0.01881151E+05 0.07754936E+02                   4
-CAI2               80792CA  1I   2          G  0200.00   5000.00  1000.00      1
- 0.07403366E+02 0.01208762E-02-0.05698306E-06 0.01167152E-09-0.08696049E-14    2
--0.03328039E+06-0.02870204E+02 0.06975307E+02 0.01413683E-01-0.01046359E-04    3
--0.01757655E-08 0.03111958E-11-0.03318450E+06-0.07269292E+01                   4
-CAO                80792CA  1O   1          G  0200.00   5000.00  1000.00      1
- 0.08665723E+02-0.09857255E-01 0.07277137E-04-0.01813874E-07 0.01477538E-11    2
- 0.02566423E+05-0.02151985E+03 0.07277069E+02-0.02477194E+00 0.06313166E-03    3
--0.06322423E-06 0.02200693E-09 0.03774998E+05-0.09934620E+02                   4
-CAO(S)             81092CA  1O   1          S  0200.00   3600.00  1000.00      1
- 0.05184497E+02 0.01938337E-01-0.08932525E-05 0.02410689E-08-0.02389613E-12    2
--0.07806390E+06-0.02562669E+03 0.02964466E+02 0.09464719E-01-0.07948131E-04    3
- 0.06517958E-08 0.01313902E-10-0.07762567E+06-0.01476156E+03                   4
-CAOH               80792CA  1H   1O   1     G  0200.00   5000.00  1000.00      1
- 0.05164977E+02 0.01974644E-01-0.07757403E-05 0.01507385E-08-0.01048831E-12    2
--0.02493597E+06-0.01690344E+02 0.03596803E+02 0.08182874E-01-0.07863515E-04    3
- 0.01974293E-07 0.06136755E-11-0.02469004E+06 0.05713983E+02                   4
-CAOH+              80792CA  1H   1O   1E  -1G  0200.00   5000.00  1000.00      1
- 0.05293390E+02 0.01697953E-01-0.05704847E-05 0.09169199E-09-0.05724155E-13    2
- 0.04274157E+06-0.03041255E+02 0.03766022E+02 0.07251869E-01-0.05903957E-04    3
- 0.02063514E-08 0.01186538E-10 0.04300269E+06 0.04285959E+02                   4
-CAS                80792CA  1S   1          G  0200.00   5000.00  1000.00      1
- 0.04077726E+02-0.02148896E-01 0.03595164E-04-0.01167272E-07 0.01101218E-11    2
- 0.01401038E+06 0.05797750E+02 0.05045918E+02-0.09248234E-01 0.03176027E-03    3
--0.04007223E-06 0.01698112E-09 0.01355553E+06 0.08770679E+01                   4
-CCL                40992C   1CL  1          G  0200.00   4000.00  1500.00      1
- 0.04306010E+02 0.01816861E-02-0.07184326E-06 0.01354479E-09-0.01002479E-13    2
- 0.05198808E+06 0.01558593E+02 0.02871441E+02 0.04709268E-01-0.05629052E-04    3
- 0.03086609E-07-0.06379756E-11 0.05237631E+06 0.08859373E+02                   4
-CCL2               40992C   1CL  2          G  0200.00   4000.00  1500.00      1
- 0.06632435E+02 0.03558831E-02-0.01507592E-05 0.03116243E-09-0.02546496E-13    2
- 0.02443636E+06-0.06590137E+02 0.03329579E+02 0.01112853E+00-0.01375891E-03    3
- 0.07726329E-07-0.01624070E-10 0.02530408E+06 0.01010975E+03                   4
-CCL2CCLO           40992C   2 O  1CL  3     G  0200.00   4000.00  1500.00      1
- 0.01497380E+03 0.09004180E-02-0.03714287E-05 0.05602716E-09-0.02392170E-13    2
--0.01781718E+06-0.04510704E+03 0.05066114E+02 0.02846673E+00-0.03113001E-03    3
- 0.01605483E-06-0.03208502E-10-0.01474354E+06 0.06663101E+02                   4
-CCL2CCLOH          53090C   2H   1O   1CL  3G  0200.00   5000.00  1500.00      1
- 0.01567259E+03 0.02218766E-01-0.04425239E-05 0.06261725E-10 0.03673507E-13    2
--0.02855361E+06-0.05085224E+03 0.04602117E+02 0.03408842E+00-0.03836909E-03    3
- 0.02120271E-06-0.04527143E-10-0.02507945E+06 0.06859776E+02                   4
-CCL2CH             40992H   1C   2CL  2     G  0200.00   4000.00  1500.00      1
- 0.01101223E+03 0.01364477E-01-0.03497001E-05 0.01107466E-09 0.03844298E-13    2
- 0.02706218E+06-0.02886258E+03 0.02961736E+02 0.02429423E+00-0.02731403E-03    3
- 0.01493184E-06-0.03162966E-10 0.02960233E+06 0.01317486E+03                   4
-CCL2HOO            53090C   1H   1O   2CL  2G  0200.00   5000.00  1500.00      1
- 0.01273967E+03 0.01671789E-01-0.03280073E-05 0.09239024E-10 0.02183938E-13    2
--0.05665041E+05-0.03552584E+03 0.03425417E+02 0.02745544E+00-0.02973832E-03    3
- 0.01588391E-06-0.03309428E-10-0.02675529E+05 0.01333474E+03                   4
-CCL2OHCH2          53090C   2H   3O   1CL  2G  0200.00   5000.00  1500.00      1
- 0.01606355E+03 0.02856412E-01-0.05564238E-05 0.02056416E-09 0.02871365E-13    2
--0.01756115E+06-0.05438455E+03 0.02870959E+02 0.04462273E+00-0.05377946E-03    3
- 0.03093185E-06-0.06719238E-10-0.01379636E+06 0.01305466E+03                   4
-CCL2OHCHCL         53090C   2H   2O   1CL  3G  0200.00   5000.00  1500.00      1
- 0.01681474E+03 0.02433421E-01-0.04717311E-05 0.01595327E-09 0.02647197E-13    2
--0.02217115E+06-0.05406904E+03 0.05487264E+02 0.03719540E+00-0.04391386E-03    3
- 0.02501465E-06-0.05417859E-10-0.01882134E+06 0.04237537E+02                   4
-CCL3               40992C   1CL  3          G  0200.00   4000.00  1500.00      1
- 0.09375859E+02 0.05723237E-02-0.02242398E-05 0.04238666E-09-0.03174834E-13    2
- 0.05113147E+05-0.01813304E+03 0.04292822E+02 0.01682379E+00-0.02044420E-03    3
- 0.01135805E-06-0.02371493E-10 0.06477756E+05 0.07677874E+02                   4
-CCL3CCLH2          53090C   2H   2CL  4     G  0200.00   5000.00  1500.00      1
- 0.01788619E+03 0.02281235E-01-0.04746598E-05 0.01962667E-09 0.02451768E-13    2
--0.02496335E+06-0.06312883E+03 0.03463508E+02 0.04144805E+00-0.04421053E-03    3
- 0.02320525E-06-0.04772525E-10-0.02028144E+06 0.01275956E+03                   4
-CCL3CCLO           40992C   2 O  1CL  4     G  0200.00   4000.00  1500.00      1
- 0.01687401E+03 0.01341876E-01-0.04555006E-05 0.07178333E-09-0.04348641E-13    2
--0.03442278E+06-0.05295025E+03 0.06334167E+02 0.03461171E+00-0.04173791E-03    3
- 0.02324686E-06-0.04882451E-10-0.03152121E+06 0.07697654E+01                   4
-CCL3CH2            53090C   2H   2CL  3     G  0200.00   5000.00  1500.00      1
- 0.01468243E+03 0.02202649E-01-0.03960690E-05 0.02319280E-10 0.03655521E-13    2
- 0.03875531E+05-0.04495230E+03 0.05008132E+02 0.03031103E+00-0.03453620E-03    3
- 0.01951049E-06-0.04245840E-10 0.06936588E+05 0.05474640E+02                   4
-CCL3CHCL           53090C   2H   1CL  4     G  0200.00   5000.00  1500.00      1
- 0.01610198E+03 0.01597223E-01-0.04069892E-05 0.04158083E-09-0.01105635E-13    2
--0.02318814E+04-0.04936573E+03 0.05761929E+02 0.03433482E+00-0.04163980E-03    3
- 0.02362341E-06-0.05054182E-10 0.02663920E+05 0.03399588E+02                   4
-CCL3CHO            53090C   2H   1O   1CL  3G  0200.00   5000.00  1500.00      1
- 0.01532135E+03 0.01914228E-01-0.03622777E-05 0.05526564E-10 0.03016202E-13    2
--0.02886499E+06-0.04774516E+03 0.05016867E+02 0.02961902E+00-0.03140321E-03    3
- 0.01666643E-06-0.03481662E-10-0.02544921E+06 0.06644422E+02                   4
-CCL3OO             53090C   1O   2CL  3     G  0200.00   5000.00  1500.00      1
- 0.01473249E+03 0.08345102E-02-0.03627944E-05 0.07101159E-09-0.05165897E-13    2
--0.05526644E+05-0.04381961E+03 0.04317420E+02 0.03486414E+00-0.04287094E-03    3
- 0.02371950E-06-0.04903871E-10-0.02855912E+05 0.08720693E+02                   4
-CCL4               40992C   1CL  4          G  0200.00   4000.00  1500.00      1
- 0.01222570E+03 0.07440275E-02-0.03141658E-05 0.06499383E-09-0.05330319E-13    2
--0.01439931E+06-0.03133566E+03 0.05107111E+02 0.02402469E+00-0.02980593E-03    3
- 0.01678331E-06-0.03535253E-10-0.01253198E+06 0.04640845E+02                   4
-CCLH2OO            53090C   1H   2O   2CL  1G  0200.00   5000.00  1500.00      1
- 0.01131351E+03 0.02330645E-01-0.03546376E-05-0.02064087E-09 0.06154082E-13    2
--0.04225590E+05-0.03183829E+03 0.01583541E+02 0.02745395E+00-0.02803155E-03    3
- 0.01491598E-06-0.03172720E-10-0.08340802E+04 0.01999023E+03                   4
-CH                121286C   1H   1          G  0200.00   5000.00  1000.00      1
- 0.02196223E+02 0.02340381E-01-0.07058201E-05 0.09007582E-09-0.03855040E-13    2
- 0.07086723E+06 0.09178373E+02 0.03200202E+02 0.02072876E-01-0.05134431E-04    3
- 0.05733890E-07-0.01955533E-10 0.07045259E+06 0.03331588E+02                   4
-CH+               121286C   1H   1E  -1     G  0200.00   5000.00  1000.00      1
- 0.02753358E+02 0.01552900E-01-0.05368453E-05 0.08921772E-09-0.05416801E-13    2
- 0.01948467E+07 0.04654892E+02 0.03327207E+02 0.01347051E-01-0.03895861E-04    3
- 0.05129390E-07-0.02054576E-10 0.01946452E+07 0.01408474E+02                   4
-CH2               120186C   1H   2          G  0250.00   4000.00  1000.00      1
- 0.03636408E+02 0.01933057E-01-0.01687016E-05-0.01009899E-08 0.01808256E-12    2
- 0.04534134E+06 0.02156561E+02 0.03762237E+02 0.01159819E-01 0.02489585E-05    3
- 0.08800836E-08-0.07332435E-11 0.04536791E+06 0.01712578E+02                   4
-CH2(S)             31287C   1H   2          G  0200.00   4000.00  1000.00      1
- 0.03552889E+02 0.02066788E-01-0.01914116E-05-0.01104673E-08 0.02021350E-12    2
- 0.04984975E+06 0.01686570E+02 0.03971265E+02-0.01699089E-02 0.01025369E-04    3
- 0.02492551E-07-0.01981266E-10 0.04989368E+06 0.05753207E+00                   4
-CH2CCL             53090C   2H   2CL  1     G  0200.00   5000.00  1500.00      1
- 0.09117805E+02 0.02336015E-01-0.03466390E-05-0.03584809E-09 0.08154328E-13    2
- 0.02697366E+06-0.02251742E+03 0.01553177E+02 0.02243159E+00-0.02366950E-03    3
- 0.01323270E-06-0.02931823E-10 0.02962339E+06 0.01769303E+03                   4
-CH2CCL2            53090C   2H   2CL  2     G  0200.00   5000.00  1500.00      1
- 0.01169451E+03 0.02435982E-01-0.03733045E-05-0.01419412E-09 0.05199337E-13    2
--0.04601975E+05-0.03547415E+03 0.01527166E+02 0.02983780E+00-0.03171097E-03    3
- 0.01728380E-06-0.03709638E-10-0.01173986E+05 0.01827540E+03                   4
-CH2CCLOH           53090C   2H   3O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.01267601E+03 0.03201392E-01-0.04788878E-05-0.02136104E-09 0.07030796E-13    2
--0.02402379E+06-0.04128498E+03 0.06647840E+01 0.03723168E+00-0.04115206E-03    3
- 0.02307135E-06-0.05021609E-10-0.02012318E+06 0.02165270E+03                   4
-CH2CHCCH           82489C   4H   4          G  0200.00   4000.00  1000.00      1
- 0.01069777E+03 0.06982014E-01-0.06567747E-05-0.03884517E-08 0.07200946E-12    2
- 0.03034803E+06-0.03128430E+03 0.03233893E+02 0.01865634E+00 0.01270320E-04    3
--0.09410096E-07 0.02956111E-10 0.03301097E+06 0.09922676E+02                   4
-CH2CHCCH2          82489C   4H   5          G  0200.00   4000.00  1000.00      1
- 0.01199776E+03 0.07990580E-01-0.08098173E-05-0.04568733E-08 0.08636910E-12    2
- 0.03228493E+06-0.03528495E+03 0.03879443E+02 0.01997664E+00 0.01872777E-04    3
--0.09306953E-07 0.02386116E-10 0.03526859E+06 0.09842152E+02                   4
-CH2CHCH2           82489C   3H   5          G  0200.00   4000.00  1000.00      1
- 0.09651539E+02 0.08075596E-01-0.07965424E-05-0.04650696E-08 0.08603280E-12    2
- 0.01530096E+06-0.02686774E+03 0.02276486E+02 0.01985564E+00 0.01123842E-04    3
--0.01014576E-06 0.03441342E-10 0.01789497E+06 0.01372515E+03                   4
-CH2CHCHCH          82489C   4H   5          G  0200.00   4000.00  1000.00      1
- 0.01286597E+03 0.07943369E-01-0.08626466E-05-0.04655635E-08 0.08951131E-12    2
- 0.03783552E+06-0.04182502E+03 0.02995240E+02 0.02288456E+00 0.01975471E-04    3
--0.01148245E-06 0.03197824E-10 0.04142218E+06 0.01289454E+03                   4
-CH2CHCHCH2        120189C   4H   6          G  0200.00   4000.00  1000.00      1
- 0.01254437E+03 0.09596525E-01-0.09187012E-05-0.05429640E-08 0.01005364E-11    2
- 0.08597330E+05-0.04217451E+03 0.01931624E+02 0.02479030E+00 0.03018071E-04    3
--0.01154686E-06 0.02586623E-10 0.01255468E+06 0.01701999E+03                   4
-CH2CHCL            53090C   2H   3CL  1     G  0200.00   5000.00  1500.00      1
- 0.01029820E+03 0.03042926E-01-0.03881390E-05-0.04925565E-09 0.01005072E-12    2
--0.02492899E+05-0.03108614E+03 0.01118026E+01 0.02796358E+00-0.02726559E-03    3
- 0.01463257E-06-0.03204075E-10 0.01287844E+05 0.02381617E+03                   4
-CH2CL              53090C   1H   2CL  1     G  0200.00   5000.00  1500.00      1
- 0.06822515E+02 0.01659744E-01-0.02075515E-05-0.02793518E-09 0.05509087E-13    2
- 0.01080454E+06-0.01090504E+03 0.02419924E+02 0.01303317E+00-0.01356559E-03    3
- 0.07836108E-07-0.01800535E-10 0.01243112E+06 0.01269845E+03                   4
-CH2CL2            112989C   1H   2CL  2     G  0200.00   5000.00  1000.00      1
- 0.05917327E+02 0.06762395E-01-0.02676163E-04 0.04856687E-08-0.03316974E-12    2
--0.01385926E+06-0.03877739E+02 0.01423284E+02 0.02116658E+00-0.02178088E-03    3
- 0.01345873E-06-0.03811649E-10-0.01268664E+06 0.01893445E+03                   4
-CH2CLCCL2          53090C   2H   2CL  3     G  0200.00   5000.00  1500.00      1
- 0.01438156E+03 0.02379635E-01-0.04167426E-05-0.02445116E-10 0.04499574E-13    2
--0.02746720E+05-0.04351762E+03 0.03351194E+02 0.03297633E+00-0.03604139E-03    3
- 0.01977453E-06-0.04233823E-10 0.08620011E+04 0.01444760E+03                   4
-CH2CLCCLO          53090C   2H   2O   1CL  2G  0200.00   5000.00  1500.00      1
- 0.01392027E+03 0.02589602E-01-0.04141892E-05-0.01643169E-09 0.06237174E-13    2
--0.03517257E+06-0.04389503E+03 0.02705995E+02 0.03210128E+00-0.03357727E-03    3
- 0.01814310E-06-0.03890009E-10-0.03130905E+06 0.01566013E+03                   4
-CH2CLCH2           53090C   2H   4CL  1     G  0200.00   5000.00  1500.00      1
- 0.01167011E+03 0.03554722E-01-0.04124241E-05-0.07276110E-09 0.01316756E-12    2
- 0.06201629E+05-0.03604549E+03 0.01635864E+02 0.02680201E+00-0.02491421E-03    3
- 0.01349235E-06-0.03046571E-10 0.01014294E+06 0.01864248E+03                   4
-CH2CLCH2CL         53090C   2H   4CL  2     G  0200.00   5000.00  1500.00      1
- 0.01443143E+03 0.03836770E-01-0.05299122E-05-0.05165412E-09 0.01177636E-12    2
--0.02296285E+06-0.05130124E+03-0.02436500E+01 0.04032574E+00-0.03956993E-03    3
- 0.02074245E-06-0.04412604E-10-0.01767830E+06 0.02741366E+03                   4
-CH2CLCHCL          53090C   2H   3CL  2     G  0200.00   5000.00  1500.00      1
- 0.01295593E+03 0.03001689E-01-0.04165162E-05-0.03909055E-09 0.09041090E-13    2
- 0.09932077E+04-0.03925387E+03 0.02276185E+02 0.03011401E+00-0.03047664E-03    3
- 0.01654880E-06-0.03613198E-10 0.04836340E+05 0.01792166E+03                   4
-CH2CLCHCL2         53090C   2H   3CL  3     G  0200.00   5000.00  1500.00      1
- 0.01618739E+03 0.03047681E-01-0.05011496E-05-0.01596701E-09 0.07107547E-13    2
--0.02474417E+06-0.05695454E+03 0.01239011E+02 0.04148444E+00-0.04188654E-03    3
- 0.02163214E-06-0.04467364E-10-0.01960717E+06 0.02257856E+03                   4
-CH2CLCHO           53090C   2H   3O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.01227955E+03 0.03320979E-01-0.04106710E-05-0.06199826E-09 0.01190594E-12    2
--0.02678416E+06-0.03762356E+03 0.06553003E+01 0.02959046E+00-0.02635056E-03    3
- 0.01327545E-06-0.02838288E-10-0.02227005E+06 0.02576797E+03                   4
-CH2CO             121686C   2H   2O   1     G  0200.00   5000.00  1000.00      1
- 0.06038817E+02 0.05804840E-01-0.01920954E-04 0.02794485E-08-0.01458868E-12    2
--0.08583402E+05-0.07657581E+02 0.02974971E+02 0.01211871E+00-0.02345046E-04    3
--0.06466685E-07 0.03905649E-10-0.07632637E+05 0.08673553E+02                   4
-CH2F2              82489C   1H   2F   2     G  0200.00   5000.00  1000.00      1
- 0.04730052E+02 0.07997300E-01-0.03186045E-04 0.05801160E-08-0.03967925E-12    2
--0.05637288E+06-0.04954843E+01 0.03669434E+01 0.02168917E+00-0.02441913E-03    3
- 0.01942310E-06-0.06978343E-10-0.05510103E+06 0.02202215E+03                   4
-CH2HCO            110393O   1H   3C   2     G  0200.00   5000.00  1000.00      1
- 0.05975670E+02 0.08130591E-01-0.02743624E-04 0.04070304E-08-0.02176017E-12    2
- 0.04903218E+04-0.05045251E+02 0.03409062E+02 0.01073857E+00 0.01891492E-04    3
--0.07158583E-07 0.02867385E-10 0.01521477E+05 0.09558290E+02                   4
-CH2O              121286C   1H   2O   1     G  0200.00   5000.00  1000.00      1
- 0.02995606E+02 0.06681321E-01-0.02628955E-04 0.04737153E-08-0.03212517E-12    2
--0.01532037E+06 0.06912572E+02 0.01652731E+02 0.01263144E+00-0.01888168E-03    3
- 0.02050031E-06-0.08413237E-10-0.01486540E+06 0.01378482E+03                   4
-CH2OH             120186H   3C   1O   1     G  0250.00   4000.00  1000.00      1
- 0.06327520E+02 0.03608271E-01-0.03201547E-05-0.01938750E-08 0.03509705E-12    2
--0.04474509E+05-0.08329366E+02 0.02862628E+02 0.01001527E+00-0.05285436E-05    3
--0.05138540E-07 0.02246041E-10-0.03349679E+05 0.01039794E+03                   4
-CH2OHCCL2          53090C   2H   3O   1CL  2G  0200.00   5000.00  1500.00      1
- 0.01602181E+03 0.02846352E-01-0.04974218E-05-0.02167450E-10 0.05246046E-13    2
--0.01829579E+06-0.05402134E+03 0.01922940E+02 0.04158207E+00-0.04427505E-03    3
- 0.02343015E-06-0.04851868E-10-0.01375512E+06 0.02001902E+03                   4
-CH2OHCHCL          53090C   2H   4O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.01446298E+03 0.03569514E-01-0.05419118E-05-0.02862176E-09 0.08920560E-13    2
--0.01475559E+06-0.04942815E+03 0.03505696E+01 0.04212749E+00-0.04493839E-03    3
- 0.02448187E-06-0.05236589E-10-0.01007314E+06 0.02495261E+03                   4
-CH2SICL            40992H   2C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.09915966E+02 0.01896319E-01-0.03304238E-05-0.03882353E-09 0.01089169E-12    2
- 0.01906587E+06-0.02389137E+03 0.03514077E+02 0.01959495E+00-0.02147274E-03    3
- 0.01214017E-06-0.02691323E-10 0.02123280E+06 0.09882836E+02                   4
-CH2SICL3           40992H   2C   1SI  1CL  3G  0200.00   4000.00  1500.00      1
- 0.01476240E+03 0.02289499E-01-0.04148337E-05-0.01526182E-09 0.07724698E-13    2
--0.04947703E+06-0.04020475E+03 0.06718170E+02 0.02712662E+00-0.03168529E-03    3
- 0.01809641E-06-0.03938906E-10-0.04710183E+06 0.01167360E+02                   4
-CH2SIH2CL          40992H   4C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01260561E+03 0.03468476E-01-0.04606434E-05-0.09748147E-09 0.02077681E-12    2
--0.05748538E+05-0.03743183E+03 0.02426229E+02 0.03028056E+00-0.03039200E-03    3
- 0.01612599E-06-0.03425629E-10-0.02268891E+05 0.01657736E+03                   4
-CH2SIHCL2          40992H   3C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01365092E+03 0.02909029E-01-0.04521180E-05-0.05274788E-09 0.01389320E-12    2
--0.02781262E+06-0.03810353E+03 0.04180967E+02 0.03005761E+00-0.03288772E-03    3
- 0.01822025E-06-0.03925700E-10-0.02480330E+06 0.01134845E+03                   4
-CH3               121286C   1H   3          G  0200.00   5000.00  1000.00      1
- 0.02844052E+02 0.06137974E-01-0.02230345E-04 0.03785161E-08-0.02452159E-12    2
- 0.01643781E+06 0.05452697E+02 0.02430443E+02 0.01112410E+00-0.01680220E-03    3
- 0.01621829E-06-0.05864953E-10 0.01642378E+06 0.06789794E+02                   4
-CH3C(O)CL          53090C   2H   3O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.01240568E+03 0.03210496E-01-0.03737157E-05-0.06739592E-09 0.01219122E-12    2
--0.03432420E+06-0.03909195E+03 0.02275117E+02 0.02518533E+00-0.02152420E-03    3
- 0.01084005E-06-0.02369191E-10-0.03024376E+06 0.01657016E+03                   4
-CH3CC              82489C   3H   3          G  0200.00   4000.00  1000.00      1
- 0.07640221E+02 0.05233556E-01-0.05053635E-05-0.02919772E-08 0.05445700E-12    2
- 0.05909763E+06-0.01629573E+03 0.03798751E+02 0.08749062E-01 0.02523014E-04    3
--0.01529373E-07-0.01410562E-10 0.06077425E+06 0.05989223E+02                   4
-CH3CCCH2           82489C   4H   5          G  0200.00   4000.00  1000.00      1
- 0.01156506E+03 0.08030297E-01-0.07649450E-05-0.04476534E-08 0.08313260E-12    2
- 0.03256813E+06-0.03014066E+03 0.05068450E+02 0.01571747E+00 0.02968975E-04    3
--0.04990587E-07-0.02984224E-11 0.03518855E+06 0.06791893E+02                   4
-CH3CCCH3          120189C   4H   6          G  0200.00   4000.00  1000.00      1
- 0.01133658E+03 0.01005764E+00-0.09511323E-05-0.05660497E-08 0.01049451E-11    2
- 0.01547659E+06-0.03350867E+03 0.04077105E+02 0.01703159E+00 0.04707490E-04    3
--0.03767240E-07-0.02066963E-10 0.01859757E+06 0.08444801E+02                   4
-CH3CCH2            82489C   3H   5          G  0200.00   4000.00  1000.00      1
- 0.09101018E+02 0.07964168E-01-0.07884945E-05-0.04562036E-08 0.08529212E-12    2
- 0.02670680E+06-0.02150559E+03 0.03385811E+02 0.01404534E+00 0.03204127E-04    3
--0.03824120E-07-0.09053742E-11 0.02909066E+06 0.01126649E+03                   4
-CH3CCL             53090C   2H   3CL  1     G  0200.00   5000.00  1500.00      1
- 0.01023962E+03 0.02767116E-01-0.03228853E-05-0.05752548E-09 0.01043430E-12    2
- 0.02633607E+06-0.02806184E+03 0.01687397E+02 0.02164347E+00-0.01891466E-03    3
- 0.09699015E-07-0.02134580E-10 0.02975387E+06 0.01882236E+03                   4
-CH3CCL2            53090C   2H   3CL  2     G  0200.00   5000.00  1500.00      1
- 0.01300035E+03 0.02940485E-01-0.03746456E-05-0.05040644E-09 0.01006332E-12    2
--0.04228816E+04-0.03979863E+03 0.03213473E+02 0.02587378E+00-0.02419993E-03    3
- 0.01273817E-06-0.02788481E-10 0.03325663E+05 0.01333320E+03                   4
-CH3CCL3            53090C   2H   3CL  3     G  0200.00   5000.00  1500.00      1
- 0.01637160E+03 0.02935021E-01-0.04836108E-05-0.01454723E-09 0.06731691E-13    2
--0.02378095E+06-0.05941864E+03 0.02484363E+02 0.03909474E+00-0.04013637E-03    3
- 0.02110179E-06-0.04418213E-10-0.01902540E+06 0.01435603E+03                   4
-CH3CCLO            53090C   2H   3O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.01240595E+03 0.03210266E-01-0.03736397E-05-0.06740236E-09 0.01219081E-12    2
--0.03432283E+06-0.03909605E+03 0.02277402E+02 0.02517912E+00-0.02151632E-03    3
- 0.01083524E-06-0.02368079E-10-0.03024308E+06 0.01655556E+03                   4
-CH3CH2CCH         120189C   4H   6          G  0200.00   4000.00  1000.00      1
- 0.01200695E+03 0.09576069E-01-0.08995018E-05-0.05369808E-08 0.09934174E-12    2
- 0.01729420E+06-0.03802692E+03 0.03726043E+02 0.02053493E+00 0.03021439E-04    3
--0.08131813E-07 0.01095280E-10 0.02048821E+06 0.08538826E+02                   4
-CH3CH2CH2C         62090C   4H  10          G  0200.00   4000.00  1500.00      1
- 0.02032597E+03 0.01025189E+00-0.09348665E-05-0.04706743E-08 0.08327283E-12    2
--0.02590868E+06-0.08998431E+03-0.02544545E+02 0.05770712E+00-0.04104933E-03    3
- 0.01684742E-06-0.03176653E-10-0.01682847E+06 0.03586176E+03                   4
-CH3CH2CL           53090C   2H   5CL  1     G  0200.00   5000.00  1500.00      1
- 0.01301118E+03 0.04448941E-01-0.05200473E-05-0.09119710E-09 0.01658842E-12    2
--0.02013503E+06-0.04677847E+03-0.06981899E+01 0.03567705E+00-0.03230260E-03    3
- 0.01689622E-06-0.03727523E-10-0.01476054E+06 0.02802219E+03                   4
-CH3CH2O           103190C   2H   5O   1     G  0200.00   4000.00  1500.00      1
- 0.01187115E+03 0.05390415E-01-0.04990159E-05-0.02399585E-08 0.04255456E-12    2
--0.05950457E+05-0.03996585E+03 0.06904570E+01 0.02951398E+00-0.02245116E-03    3
- 0.01011600E-06-0.02044101E-10-0.01559918E+05 0.02130230E+03                   4
-CH3CHCH            82489C   3H   5          G  0200.00   4000.00  1000.00      1
- 0.09209764E+02 0.07871413E-01-0.07724523E-05-0.04497357E-08 0.08377272E-12    2
- 0.02853967E+06-0.02232370E+03 0.03161863E+02 0.01518100E+00 0.02722659E-04    3
--0.05177112E-07 0.05435286E-12 0.03095548E+06 0.01197973E+03                   4
-CH3CHCL            53090C   2H   4CL  1     G  0200.00   5000.00  1500.00      1
- 0.01166291E+03 0.03539284E-01-0.03858423E-05-0.08186871E-09 0.01407549E-12    2
- 0.03696642E+05-0.03616108E+03 0.01903574E+02 0.02438193E+00-0.02062779E-03    3
- 0.01068382E-06-0.02414461E-10 0.07722870E+05 0.01768152E+03                   4
-CH3CHCL2           53090C   2H   4CL  2     G  0200.00   5000.00  1500.00      1
- 0.01454311E+03 0.03772378E-01-0.05189301E-05-0.05141063E-09 0.01163076E-12    2
--0.02277045E+06-0.05147426E+03 0.04510764E+01 0.03884901E+00-0.03832912E-03    3
- 0.02029502E-06-0.04357591E-10-0.01767234E+06 0.02414546E+03                   4
-CH3CHOH           103190C   2H   5O   1     G  0200.00   4000.00  1500.00      1
- 0.01161148E+03 0.05173117E-01-0.04856685E-05-0.02202895E-08 0.03913721E-12    2
--0.01248811E+06-0.03688213E+03 0.01415940E+02 0.02870648E+00-0.02373820E-03    3
- 0.01148886E-06-0.02391420E-10-0.08638718E+05 0.01844256E+03                   4
-CH3CL             112989C   1H   3CL  1     G  0200.00   5000.00  1000.00      1
- 0.03633876E+02 0.08664625E-01-0.03343871E-04 0.05950130E-08-0.04001401E-12    2
--0.01177659E+06 0.04430651E+02 0.04621901E+01 0.02068247E+00-0.02553133E-03    3
- 0.02160311E-06-0.07706816E-10-0.01093667E+06 0.02032977E+03                   4
-CH3CO             120186C   2H   3O   1     G  0200.00   5000.00  1000.00      1
- 0.05612279E+02 0.08449886E-01-0.02854147E-04 0.04238376E-08-0.02268404E-12    2
--0.05187863E+05-0.03274949E+02 0.03125278E+02 0.09778220E-01 0.04521448E-04    3
--0.09009462E-07 0.03193718E-10-0.04108508E+05 0.01122885E+03                   4
-CH3F               82489C   1H   3F   1     G  0200.00   5000.00  1000.00      1
- 0.03014978E+02 0.09314397E-01-0.03611697E-04 0.06443728E-08-0.04339594E-12    2
--0.02977838E+06 0.06323815E+02 0.02600911E+01 0.02000788E+00-0.02662585E-03    3
- 0.02561177E-06-0.09935237E-10-0.02896233E+06 0.02031799E+03                   4
-CH3HCO            120186C   2O   1H   4     G  0200.00   5000.00  1000.00      1
- 0.05868650E+02 0.01079424E+00-0.03645530E-04 0.05412912E-08-0.02896844E-12    2
--0.02264569E+06-0.06012946E+02 0.02505695E+02 0.01336991E+00 0.04671953E-04    3
--0.01128140E-06 0.04263566E-10-0.02124589E+06 0.01335089E+03                   4
-CH3NO             103190C   1H   3N   1O   1G  0200.00   4000.00  1500.00      1
- 0.08820547E+02 0.03706233E-01-0.02894741E-05-0.01897910E-08 0.03237544E-12    2
- 0.05362862E+05-0.02213220E+03 0.02109955E+02 0.01517822E+00-0.07071789E-04    3
- 0.01510611E-07-0.01604204E-11 0.08293612E+05 0.01569702E+03                   4
-CH3NO2            103190C   1H   3N   1O   2G  0200.00   4000.00  1500.00      1
- 0.01090158E+03 0.04326381E-01-0.04203548E-05-0.01893071E-08 0.03417444E-12    2
--0.01370862E+06-0.03073183E+03 0.03224717E+01 0.02665147E+00-0.01930574E-03    3
- 0.07762620E-07-0.01398746E-10-0.09597527E+05 0.02726156E+03                   4
-CH3O              121686C   1H   3O   1     G  0200.00   3000.00  1000.00      1
- 0.03770800E+02 0.07871497E-01-0.02656384E-04 0.03944431E-08-0.02112616E-12    2
- 0.01278325E+04 0.02929575E+02 0.02106204E+02 0.07216595E-01 0.05338472E-04    3
--0.07377636E-07 0.02075611E-10 0.09786011E+04 0.01315218E+03                   4
-CH3OCH3           103190C   2H   6O   1     G  0200.00   4000.00  1500.00      1
- 0.01228100E+03 0.06711031E-01-0.04726871E-05-0.03636409E-08 0.06084545E-12    2
--0.02839743E+06-0.04434692E+03 0.01245246E+02 0.02381198E+00-0.08266949E-04    3
- 0.03068452E-08 0.01909248E-11-0.02335996E+06 0.01855817E+03                   4
-CH3OCL             53090C   1H   3O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.01022518E+03 0.02780047E-01-0.03331582E-05-0.05437858E-09 0.01012799E-12    2
--0.01172886E+06-0.02912014E+03 0.01575392E+02 0.02255642E+00-0.02052644E-03    3
- 0.01075312E-06-0.02371140E-10-0.08346834E+05 0.01804593E+03                   4
-CH3OH             121686C   1H   4O   1     G  0200.00   5000.00  1000.00      1
- 0.04029061E+02 0.09376593E-01-0.03050254E-04 0.04358793E-08-0.02224723E-12    2
--0.02615791E+06 0.02378196E+02 0.02660115E+02 0.07341508E-01 0.07170051E-04    3
--0.08793194E-07 0.02390570E-10-0.02535348E+06 0.01123263E+03                   4
-CH3ONO            103190C   1H   3N   1O   2G  0200.00   4000.00  1500.00      1
- 0.01136129E+03 0.04159349E-01-0.04145670E-05-0.01695140E-08 0.03028732E-12    2
--0.01281482E+06-0.03545435E+03 0.01490345E+02 0.02645433E+00-0.02112332E-03    3
- 0.09414399E-07-0.01811205E-10-0.09125782E+05 0.01813766E+03                   4
-CH3ONO2           103190C   1H   3N   1O   3G  0200.00   4000.00  1500.00      1
- 0.01436189E+03 0.04112243E-01-0.05113052E-05-0.01496436E-08 0.03012156E-12    2
--0.01972440E+06-0.05131842E+03 0.07803354E+01 0.03454204E+00-0.02822328E-03    3
- 0.01232324E-06-0.02302164E-10-0.01465346E+06 0.02245752E+03                   4
-CH3SICL            10891C   1H   3CL  1SI  1G  0200.00   4000.00  1500.00      1
- 0.01001981E+03 0.03098227E-01-0.03223524E-05-0.01222654E-08 0.02254960E-12    2
--0.05427416E+05-0.02357211E+03 0.03485139E+02 0.01833182E+00-0.01573128E-03    3
- 0.07856310E-07-0.01670946E-10-0.02954042E+05 0.01186948E+03                   4
-CH3SIH2SIH         10891C   2H  10SI  2     G  0200.00   4000.00  1500.00      1
- 0.02302241E+03 0.08819047E-01-0.08859755E-05-0.03700889E-08 0.06746256E-12    2
--0.01577058E+06-0.09458104E+03 0.02492915E+02 0.05396367E+00-0.04281663E-03    3
- 0.01967585E-06-0.03981630E-10-0.07813141E+05 0.01758364E+03                   4
-CH3SIH2SIH2CH3     61991H  10C   2SI  2     G  0200.00   2500.00  1500.00      1
- 0.01948332E+03 0.01195163E+00-0.02653155E-05-0.01489522E-07 0.03049901E-11    2
--0.01405639E+06-0.07368209E+03 0.03129493E+02 0.05016930E+00-0.03522061E-03    3
- 0.01354295E-06-0.02274339E-10-0.08303932E+05 0.01426819E+03                   4
-CH3SIHCL2          10891C   1CL  2H   4SI  1G  0200.00   4000.00  1500.00      1
- 0.01459367E+03 0.04005638E-01-0.04816391E-05-0.01336359E-08 0.02648177E-12    2
--0.05325682E+06-0.04689839E+03 0.04156949E+02 0.02994072E+00-0.02797859E-03    3
- 0.01431829E-06-0.03010165E-10-0.04952345E+06 0.09043929E+02                   4
-CH4               121286C   1H   4          G  0200.00   5000.00  1000.00      1
- 0.01683479E+02 0.01023724E+00-0.03875129E-04 0.06785585E-08-0.04503423E-12    2
--0.01008079E+06 0.09623395E+02 0.07787415E+01 0.01747668E+00-0.02783409E-03    3
- 0.03049708E-06-0.01223931E-09-0.09825229E+05 0.01372219E+03                   4
-CHCL              112989C   1H   1CL  1     G  0200.00   5000.00  1200.00      1
- 0.03216518E+02 0.05976969E-01-0.02918238E-04 0.05912801E-08-0.04297945E-12    2
- 0.03879839E+06 0.07793842E+02 0.02781263E+02 0.07805384E-01-0.01063711E-03    3
- 0.01065441E-06-0.03916797E-10 0.03916144E+06 0.01045515E+03                   4
-CHCL2              40992H   1C   1CL  2     G  0200.00   4000.00  1500.00      1
- 0.06912875E+02 0.01251733E-01-0.01973086E-05-0.02153722E-09 0.05853635E-13    2
- 0.07229632E+05-0.07968135E+02 0.02809820E+02 0.01295936E+00-0.01392392E-03    3
- 0.07533319E-07-0.01588448E-10 0.08515305E+05 0.01343798E+03                   4
-CHCL2CCL2          40992H   1C   2CL  4     G  0200.00   4000.00  1500.00      1
- 0.01530640E+03 0.02140772E-01-0.04619954E-05 0.08299157E-10 0.05236928E-13    2
--0.01524306E+05-0.04358303E+03 0.04207169E+02 0.03437580E+00-0.03802411E-03    3
- 0.02026572E-06-0.04164115E-10 0.01811422E+05 0.01398021E+03                   4
-CHCL2CCLO          40992H   1C   2 O  1CL  3G  0200.00   4000.00  1500.00      1
- 0.01488775E+03 0.02323698E-01-0.04365744E-05-0.01680889E-09 0.08613253E-13    2
--0.03483792E+06-0.04504932E+03 0.04593886E+02 0.03118954E+00-0.03338775E-03    3
- 0.01763042E-06-0.03630728E-10-0.03160866E+06 0.08756166E+02                   4
-CHCL2CH2           53090C   2H   3CL  2     G  0200.00   5000.00  1500.00      1
- 0.01306632E+03 0.02964322E-01-0.04303601E-05-0.03173131E-09 0.08244908E-13    2
- 0.04594697E+05-0.03814765E+03 0.02234889E+02 0.03152885E+00-0.03307990E-03    3
- 0.01825221E-06-0.03994163E-10 0.08375531E+05 0.01944506E+03                   4
-CHCL2CHCL          53090C   2H   2CL  3     G  0200.00   5000.00  1500.00      1
- 0.01445051E+03 0.02336553E-01-0.04132107E-05-0.05243785E-11 0.04204775E-13    2
--0.05183250E+04-0.04362699E+03 0.03789098E+02 0.03243338E+00-0.03598339E-03    3
- 0.01993302E-06-0.04287482E-10 0.02920910E+05 0.01221991E+03                   4
-CHCL2CHCL2         53090C   2H   2CL  4     G  0200.00   5000.00  1500.00      1
- 0.01745859E+03 0.02484178E-01-0.05127803E-05 0.02266909E-09 0.02371932E-13    2
--0.02510699E+06-0.06065213E+03 0.02711746E+02 0.04441279E+00-0.04905962E-03    3
- 0.02632472E-06-0.05466293E-10-0.02052421E+06 0.01624857E+03                   4
-CHCL3              40992H   1C   1CL  3     G  0200.00   4000.00  1500.00      1
- 0.01034980E+03 0.01690302E-01-0.03209168E-05-0.09502160E-10 0.05845725E-13    2
--0.01567029E+06-0.02558805E+03 0.02905633E+02 0.02315061E+00-0.02534675E-03    3
- 0.01356724E-06-0.02810882E-10-0.01339798E+06 0.01310749E+03                   4
-CHCLCCL            40992H   1C   2CL  2     G  0200.00   4000.00  1500.00      1
- 0.01027647E+03 0.01733039E-01-0.03161161E-05-0.08153494E-10 0.05443014E-13    2
- 0.02418877E+06-0.02436862E+03 0.02625129E+02 0.02366908E+00-0.02583240E-03    3
- 0.01383374E-06-0.02870111E-10 0.02654214E+06 0.01545629E+03                   4
-CHCLCCLOH          53090C   2H   2O   1CL  2G  0200.00   5000.00  1500.00      1
- 0.01412206E+03 0.02583764E-01-0.04576900E-05 0.05215675E-10 0.03521300E-13    2
--0.02752482E+06-0.04544297E+03 0.02020547E+02 0.03810981E+00-0.04280147E-03    3
- 0.02343806E-06-0.04934735E-10-0.02385982E+06 0.01729375E+03                   4
-CHCLCH             53090C   2H   2CL  1     G  0200.00   5000.00  1500.00      1
- 0.09924881E+02 0.01618108E-01-0.02995768E-05-0.09718417E-11 0.03296695E-13    2
- 0.02834312E+06-0.02704593E+03 0.01190122E+02 0.02432800E+00-0.02555965E-03    3
- 0.01375158E-06-0.02941848E-10 0.03138157E+06 0.01944186E+03                   4
-CHCLCHCL           53090C   2H   2CL  2     G  0200.00   5000.00  1500.00      1
- 0.01163648E+03 0.02461981E-01-0.03900520E-05-0.01521677E-09 0.05853766E-13    2
--0.05593248E+05-0.03507354E+03 0.01054340E+02 0.03076645E+00-0.03252549E-03    3
- 0.01763454E-06-0.03774444E-10-0.02006846E+05 0.02094011E+03                   4
-CHCLCHOH           53090C   2H   3O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.01285464E+03 0.03107712E-01-0.04837735E-05-0.02088657E-09 0.07393125E-13    2
--0.02505588E+06-0.04274804E+03-0.02073397E+01 0.03868022E+00-0.04104567E-03    3
- 0.02211252E-06-0.04680556E-10-0.02074261E+06 0.02608356E+03                   4
-CHCLOH             53090C   1H   2O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.09427376E+02 0.01722643E-01-0.02912707E-05-0.03765845E-10 0.03354461E-13    2
--0.01224575E+06-0.02330123E+03 0.01319372E+02 0.02406119E+00-0.02560105E-03    3
- 0.01356738E-06-0.02812530E-10-0.09640457E+05 0.01925640E+03                   4
-CHCLOHCH2          53090C   2H   4O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.01438435E+03 0.03552541E-01-0.05033147E-05-0.04051247E-09 0.01001172E-12    2
--0.01383899E+06-0.04819745E+03 0.01473757E+02 0.03764188E+00-0.03898776E-03    3
- 0.02112109E-06-0.04543830E-10-0.09395106E+05 0.02033823E+03                   4
-CHCLOHCHCL         53090C   2H   3O   1CL  2G  0200.00   5000.00  1500.00      1
- 0.01567240E+03 0.02970040E-01-0.04827588E-05-0.01366600E-09 0.06500296E-13    2
--0.01896002E+06-0.05132923E+03 0.02626025E+02 0.03856175E+00-0.04091474E-03    3
- 0.02190241E-06-0.04603080E-10-0.01468188E+06 0.01735864E+03                   4
-CHF                82489C   1H   1F   1     G  0200.00   5000.00  1000.00      1
- 0.04242812E+02 0.02066316E-01-0.06527951E-05 0.01388700E-08-0.01213336E-12    2
- 0.01355982E+06 0.01680197E+02 0.03029061E+02 0.04850873E-01-0.04971679E-04    3
- 0.05277968E-07-0.02403154E-10 0.01401435E+06 0.08324101E+02                   4
-CHF3               82489C   1H   1F   3     G  0200.00   5000.00  1000.00      1
- 0.06834333E+02 0.06248731E-01-0.02575750E-04 0.04809112E-08-0.03352074E-12    2
--0.08663771E+06-0.01062741E+03 0.08725142E+01 0.02308432E+00-0.02123718E-03    3
- 0.01114428E-06-0.02909229E-10-0.08496391E+06 0.02021499E+03                   4
-CHOHCLCCL2         53090C   2H   2O   1CL  3G  0200.00   5000.00  1500.00      1
- 0.01681824E+03 0.02450153E-01-0.04706624E-05 0.01313263E-09 0.03046283E-13    2
--0.02253368E+06-0.05396958E+03 0.04216444E+02 0.03898554E+00-0.04360467E-03    3
- 0.02374677E-06-0.04984764E-10-0.01867017E+06 0.01152520E+03                   4
-CHSICL             40992H   1C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.08205361E+02 0.01092172E-01-0.02021812E-05-0.04611367E-10 0.03306854E-13    2
- 0.04201323E+06-0.01240589E+03 0.04575767E+02 0.01266147E+00-0.01507699E-03    3
- 0.08704482E-07-0.01902710E-10 0.04304864E+06 0.06132926E+02                   4
-CHSICL2            40992H   1C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01071823E+03 0.01148355E-01-0.02625783E-05 0.01567972E-09 0.01085455E-13    2
- 0.01124882E+06-0.02053734E+03 0.05945817E+02 0.01709681E+00-0.02135360E-03    3
- 0.01252863E-06-0.02749860E-10 0.01253413E+06 0.03573691E+02                   4
-CHSICL3            40992H   1C   1SI  1CL  3G  0200.00   4000.00  1500.00      1
- 0.01359698E+03 0.01283679E-01-0.03320724E-05 0.03292615E-09-0.05463635E-14    2
--0.02236189E+06-0.03349768E+03 0.07368467E+02 0.02227384E+00-0.02809218E-03    3
- 0.01644147E-06-0.03590729E-10-0.02071740E+06-0.02118077E+02                   4
-CHSIH2CL           40992H   3C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01142815E+03 0.02475732E-01-0.03864817E-05-0.04667547E-09 0.01222497E-12    2
- 0.02085332E+06-0.03033129E+03 0.02869509E+02 0.02622702E+00-0.02794178E-03    3
- 0.01516891E-06-0.03231519E-10 0.02364000E+06 0.01462055E+03                   4
-CHSIHCL            40992H   2C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.09716450E+02 0.01691882E-01-0.02846288E-05-0.02130090E-09 0.06948758E-13    2
- 0.03056780E+06-0.02079822E+03 0.04045980E+02 0.01850072E+00-0.02095734E-03    3
- 0.01185107E-06-0.02580401E-10 0.03232392E+06 0.08632908E+02                   4
-CHSIHCL2           40992H   2C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01246646E+03 0.01911555E-01-0.03687550E-05-0.05466318E-10 0.05749803E-13    2
--0.09679288E+04-0.03163481E+03 0.04853917E+02 0.02509790E+00-0.02916486E-03    3
- 0.01649649E-06-0.03563598E-10 0.01297543E+05 0.07606296E+02                   4
-CL                 42189CL  1               G  0200.00   5000.00  1000.00      1
- 0.02920237E+02-0.03597985E-02 0.01294294E-05-0.02162776E-09 0.01376517E-13    2
- 0.01371338E+06 0.03262690E+02 0.02381577E+02 0.08891079E-02 0.04070476E-05    3
--0.02168943E-07 0.01160827E-10 0.01383999E+06 0.06021818E+02                   4
-CL(CH3)SICH2       40992H   5C   2SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01496923E+03 0.05605854E-01-0.06191278E-05-0.02134591E-08 0.03977673E-12    2
--0.01304066E+06-0.05036296E+03 0.02980753E+02 0.03627511E+00-0.03428566E-03    3
- 0.01799146E-06-0.03853029E-10-0.08814405E+05 0.01362870E+03                   4
-CL2                42189CL  2               G  0200.00   5000.00  1000.00      1
- 0.04274587E+02 0.03717337E-02-0.01893490E-05 0.05337465E-09-0.05057602E-13    2
--0.01331149E+05 0.02256947E+02 0.03439587E+02 0.02870774E-01-0.02385871E-04    3
- 0.02892918E-08 0.02915057E-11-0.01131787E+05 0.06471359E+02                   4
-CL2CCCL2           40992C   2CL  4          G  0200.00   4000.00  1500.00      1
- 0.01440000E+03 0.01269397E-01-0.03525286E-05 0.04493620E-09-0.02348053E-13    2
--0.08039017E+05-0.04321878E+03 0.05557831E+02 0.02778255E+00-0.03176769E-03    3
- 0.01706054E-06-0.03492940E-10-0.05495042E+05 0.02293508E+02                   4
-CL2CCHCL           40992H   1C   2CL  3     G  0200.00   4000.00  1500.00      1
- 0.01278204E+03 0.02068630E-01-0.03764411E-05-0.09077792E-10 0.06116574E-13    2
--0.06934337E+05-0.03655991E+03 0.03457684E+02 0.02848717E+00-0.03070062E-03    3
- 0.01624951E-06-0.03341401E-10-0.04047205E+05 0.01206381E+03                   4
-CL2CCHO            40992H   1C   2 O  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01294627E+03 0.02168144E-01-0.04244587E-05-0.03590986E-09 0.01220303E-12    2
--0.01144361E+06-0.03783814E+03 0.03400952E+02 0.02760695E+00-0.02843245E-03    3
- 0.01470263E-06-0.03017427E-10-0.08287517E+05 0.01257321E+03                   4
-CL2CHOH            53090C   1H   2O   1CL  2G  0200.00   5000.00  1500.00      1
- 0.01129114E+03 0.02286704E-01-0.03461513E-05-0.01814480E-09 0.05661342E-13    2
--0.03803060E+06-0.03079831E+03 0.02619078E+02 0.02601286E+00-0.02784252E-03    3
- 0.01528682E-06-0.03294008E-10-0.03513998E+06 0.01492462E+03                   4
-CL2CO              40992C   1 O  1CL  2     G  0200.00   4000.00  1500.00      1
- 0.08764773E+02 0.08919938E-02-0.02237590E-05 0.01486621E-09 0.09630870E-14    2
--0.02973390E+06-0.01732025E+03 0.03460242E+02 0.01632331E+00-0.01828304E-03    3
- 0.09805656E-07-0.02024319E-10-0.02813622E+06 0.01019127E+03                   4
-CL2COH             53090C   1O   1H   1CL  2G  0200.00   5000.00  1500.00      1
- 0.01026215E+03 0.01316796E-01-0.02754008E-05 0.01630771E-09 0.06472563E-14    2
--0.01511655E+06-0.02298315E+03 0.03800719E+02 0.02204678E+00-0.02673857E-03    3
- 0.01531854E-06-0.03305323E-10-0.01332053E+06 0.09915879E+02                   4
-CL2HCO             53090C   1H   1O   1CL  2G  0200.00   5000.00  1500.00      1
- 0.01051838E+03 0.01499316E-01-0.02927670E-05 0.07898750E-10 0.01988433E-13    2
--0.06272394E+05-0.02634097E+03 0.02241202E+02 0.02456990E+00-0.02682371E-03    3
- 0.01443170E-06-0.03023080E-10-0.03624526E+05 0.01703508E+03                   4
-CL2SI(CH3)2        40992H   6C   2SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01890988E+03 0.06245385E-01-0.06370532E-05-0.02508388E-08 0.04589637E-12    2
--0.06523166E+06-0.06829627E+03 0.05958770E+02 0.03632045E+00-0.03098078E-03    3
- 0.01545683E-06-0.03292671E-10-0.06031232E+06 0.01996401E+02                   4
-CL2SI(CH3)CH2      40992H   5C   2SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01795078E+03 0.05155757E-01-0.06049094E-05-0.01717793E-08 0.03355529E-12    2
--0.03961749E+06-0.05949218E+03 0.05993815E+02 0.03621806E+00-0.03546358E-03    3
- 0.01906128E-06-0.04137511E-10-0.03541814E+06 0.04216162E+02                   4
-CL2SICH2           40992H   2C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01186709E+03 0.02689241E-01-0.04231139E-05-0.05555102E-09 0.01367174E-12    2
--0.02169965E+06-0.03225026E+03 0.04111900E+02 0.02637445E+00-0.02985130E-03    3
- 0.01679309E-06-0.03625511E-10-0.01940307E+06 0.07695176E+02                   4
-CL2SICH3           40992H   3C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01285090E+03 0.03239360E-01-0.03774509E-05-0.01111777E-08 0.02163712E-12    2
--0.03164727E+06-0.03531424E+03 0.05273286E+02 0.02205797E+00-0.02049425E-03    3
- 0.01060061E-06-0.02257829E-10-0.02891555E+06 0.05340218E+02                   4
-CL2SISI            40992SI  2CL  2          G  0200.00   4000.00  1500.00      1
- 0.09706403E+02 0.03323652E-02-0.01679851E-05 0.04061274E-09-0.03746093E-13    2
- 0.01334060E+06-0.01565614E+03 0.06576632E+02 0.01105568E+00-0.01422816E-03    3
- 0.08199114E-07-0.01752833E-10 0.01412004E+06 0.06538601E-02                   4
-CL2SISICL          40992SI  2CL  3          G  0200.00   4000.00  1500.00      1
- 0.01304318E+03-0.01847658E-03-0.02187635E-05 0.08817012E-09-0.01004063E-12    2
--0.01640770E+06-0.02832289E+03 0.08389457E+02 0.01629172E+00-0.02138192E-03    3
- 0.01207431E-06-0.02508349E-10-0.01534318E+06-0.05268396E+02                   4
-CL2SISICL2         40992SI  2CL  4          G  0200.00   4000.00  1500.00      1
- 0.01620538E+03 0.08400587E-04-0.02457560E-05 0.08992196E-09-0.09639101E-13    2
--0.05343016E+06-0.04193027E+03 0.01077595E+03 0.01717615E+00-0.02131386E-03    3
- 0.01172528E-06-0.02417202E-10-0.05196762E+06-0.01431634E+03                   4
-CL3CCO             81092C   2O   1CL  3     G  0200.00   5000.00  1400.00      1
- 0.01383246E+03 0.01240141E-01-0.03510210E-05 0.04103960E-09-0.01475220E-13    2
- 0.07499342E+07-0.03691505E+03 0.05016825E+02 0.02899350E+00-0.03563990E-03    3
- 0.02082488E-06-0.04661957E-10 0.07524076E+07 0.08141487E+02                   4
-CL3CO              53090C   1O   1CL  3     G  0200.00   5000.00  1500.00      1
- 0.01208526E+03 0.07759038E-02-0.02700075E-05 0.04346263E-09-0.02671642E-13    2
--0.06464079E+05-0.03099432E+03 0.04548646E+02 0.02463303E+00-0.02974898E-03    3
- 0.01647154E-06-0.03433021E-10-0.04416522E+05 0.07360693E+02                   4
-CL3COH             53090C   1O   1H   1CL  3G  0200.00   5000.00  1500.00      1
- 0.01285985E+03 0.01588083E-01-0.03377500E-05 0.02031362E-09 0.08017922E-14    2
--0.03807818E+06-0.03561945E+03 0.04269172E+02 0.02791723E+00-0.03272753E-03    3
- 0.01828272E-06-0.03882978E-10-0.03558880E+06 0.08521096E+02                   4
-CL3SICH3           40992H   3C   1SI  1CL  3G  0200.00   4000.00  1500.00      1
- 0.01572988E+03 0.03373817E-01-0.04472970E-05-0.09359551E-09 0.01995442E-12    2
--0.07539927E+06-0.05017697E+03 0.06708039E+02 0.02724465E+00-0.02730290E-03    3
- 0.01457864E-06-0.03116460E-10-0.07231476E+06-0.02328694E+02                   4
-CL3SISI            40992SI  2CL  3          G  0200.00   4000.00  1500.00      1
- 0.01263015E+03 0.04310339E-02-0.02248369E-05 0.05573034E-09-0.05229996E-13    2
--0.01723335E+06-0.02767933E+03 0.08429942E+02 0.01496243E+00-0.01942087E-03    3
- 0.01125326E-06-0.02414611E-10-0.01619796E+06-0.06711706E+02                   4
-CL3SISICL          40992SI  2CL  4          G  0200.00   4000.00  1500.00      1
- 0.01503498E+03 0.05376136E-02-0.02788507E-05 0.06889626E-09-0.06454867E-13    2
--0.05496076E+06-0.03460735E+03 0.09721335E+02 0.01889709E+00-0.02451039E-03    3
- 0.01419597E-06-0.03045164E-10-0.05364875E+06-0.08073287E+02                   4
-CLCCCL             40992C   2CL  2          G  0200.00   4000.00  1500.00      1
- 0.09105373E+02 0.09281996E-02-0.01948371E-05 0.01590377E-10 0.02472937E-13    2
- 0.02507216E+06-0.02072870E+03 0.05118707E+02 0.01243668E+00-0.01386540E-03    3
- 0.07609302E-07-0.01615959E-10 0.02631398E+06 0.03298777E+00                   4
-CLCCO              53090C   2O   1CL  1     G  0200.00   5000.00  1500.00      1
- 0.09368609E+02 0.03733935E-02-0.01286981E-05 0.01206469E-09 0.09220283E-15    2
- 0.01762808E+06-0.02046752E+03 0.04417443E+02 0.01129365E+00-0.01013488E-03    3
- 0.04661357E-07-0.09098661E-11 0.01952423E+06 0.06539246E+02                   4
-CLCH2OH            53090C   1H   3O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.09750194E+02 0.02974385E-01-0.03450482E-05-0.06010047E-09 0.01089784E-12    2
--0.03248678E+06-0.02345467E+03 0.08330910E+01 0.02358999E+00-0.02137297E-03    3
- 0.01105808E-06-0.02402402E-10-0.02905351E+06 0.02503745E+03                   4
-CLCO               40992C   1 O  1CL  1     G  0200.00   4000.00  1500.00      1
- 0.06134827E+02 0.05369294E-02-0.07583742E-06-0.01514557E-09 0.03376080E-13    2
--0.05363338E+05-0.03198172E+02 0.04790425E+02 0.03165209E-01-0.02098201E-04    3
- 0.07703306E-08-0.01346351E-11-0.04812905E+05 0.04257480E+02                   4
-CLCOH              53090C   1H   1O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.07642908E+02 0.01507814E-01-0.02651581E-05-0.01466785E-09 0.04797316E-13    2
--0.02511908E+05-0.01405046E+03 0.02037663E+02 0.01733328E+00-0.01936443E-03    3
- 0.01099366E-06-0.02427341E-10-0.06596141E+04 0.01538422E+03                   4
-CLH2CO             53090C   1H   2O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.09104530E+02 0.02130629E-01-0.02994563E-05-0.02733652E-09 0.06437597E-13    2
--0.05255641E+05-0.02258799E+03 0.08437505E+01 0.02258903E+00-0.02217447E-03    3
- 0.01165204E-06-0.02487574E-10-0.02264707E+05 0.02176388E+03                   4
-CLHCO              40992H   1C   1 O  1CL  1G  0200.00   4000.00  1500.00      1
- 0.07132409E+02 0.01686027E-01-0.02034320E-05-0.05804520E-09 0.01152902E-12    2
--0.02522232E+06-0.01150137E+03 0.02378612E+02 0.01278870E+00-0.01094130E-03    3
- 0.05089666E-07-0.09985544E-11-0.02348305E+06 0.01417749E+03                   4
-CLO                40992 O  1CL  1          G  0200.00   4000.00  1500.00      1
- 0.04320627E+02 0.01730970E-02-0.07157875E-06 0.01424639E-09-0.01115543E-13    2
- 0.01328601E+06 0.01764362E+02 0.02918696E+02 0.04664857E-01-0.05654826E-04    3
- 0.03131108E-07-0.06515478E-11 0.01365989E+06 0.08877238E+02                   4
-CLOCL              53090O   1CL  2          G  0200.00   5000.00  1500.00      1
- 0.06635186E+02 0.03284434E-02-0.01225328E-05 0.02123621E-09-0.01404377E-13    2
- 0.07672352E+05-0.06410996E+02 0.03397880E+02 0.01080127E+00-0.01324655E-03    3
- 0.07392960E-07-0.01546583E-10 0.08527797E+05 0.09981834E+02                   4
-CLOO               40992 O  2CL  1          G  0200.00   4000.00  1500.00      1
- 0.06500858E+02 0.04259430E-02-0.01471496E-05 0.02312042E-09-0.01357033E-13    2
- 0.01465068E+06-0.05831007E+02 0.03097113E+02 0.01088530E+00-0.01274586E-03    3
- 0.06909658E-07-0.01419679E-10 0.01560137E+06 0.01159355E+03                   4
-CLSI(CH3)2         40992H   6C   2SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01602072E+03 0.06121766E-01-0.05697358E-05-0.02685516E-08 0.04764446E-12    2
--0.02023771E+06-0.05448286E+03 0.04366292E+02 0.03146501E+00-0.02442313E-03    3
- 0.01155763E-06-0.02441972E-10-0.01561856E+06 0.09415220E+02                   4
-CLSI(CH3)2CH2      40992H   8C   3SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.02115100E+03 0.08018265E-01-0.07924248E-05-0.03295050E-08 0.05955233E-12    2
--0.02795355E+06-0.07954995E+03 0.05283182E+02 0.04510586E+00-0.03881938E-03    3
- 0.01972924E-06-0.04266615E-10-0.02191153E+06 0.06553031E+02                   4
-CLSI(CH3)3         40992H   9C   3SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.02209311E+03 0.09120019E-01-0.08258094E-05-0.04093090E-08 0.07203542E-12    2
--0.05338834E+06-0.08746922E+03 0.05151450E+02 0.04536455E+00-0.03440035E-03    3
- 0.01610968E-06-0.03411234E-10-0.04659624E+06 0.05658041E+02                   4
-CLSICH3            40992H   3C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01002062E+03 0.03097435E-01-0.03221687E-05-0.01222123E-08 0.02253457E-12    2
--0.05623578E+05-0.02357626E+03 0.03485850E+02 0.01832800E+00-0.01572477E-03    3
- 0.07852071E-07-0.01669997E-10-0.03149803E+05 0.01186709E+03                   4
-CLSISI             40992SI  2CL  1          G  0200.00   4000.00  1500.00      1
- 0.06847303E+02 0.01844250E-02-0.09793979E-06 0.02440659E-09-0.02287823E-13    2
- 0.04772443E+06-0.03339368E+02 0.05234557E+02 0.05788035E-01-0.07516996E-04    3
- 0.04356402E-07-0.09346885E-11 0.04811932E+06 0.04702599E+02                   4
-CLSISICL           40992SI  2CL  2          G  0200.00   4000.00  1500.00      1
- 0.01008343E+03-0.01216815E-02-0.01555866E-05 0.07247150E-09-0.08633006E-13    2
- 0.01376083E+06-0.01644862E+03 0.07022588E+02 0.01136420E+00-0.01558778E-03    3
- 0.08961882E-07-0.01874769E-10 0.01437523E+06-0.01570360E+02                   4
-CN                121286C   1N   1          G  0200.00   5000.00  1000.00      1
- 0.03720120E+02 0.01518351E-02 0.01987381E-05-0.03798371E-09 0.01328230E-13    2
- 0.05111626E+06 0.02888597E+02 0.03663204E+02-0.01156529E-01 0.02163409E-04    3
- 0.01854208E-08-0.08214695E-11 0.05128118E+06 0.03739016E+02                   4
-CN+               121286C   1N   1E  -1     G  0200.00   5000.00  1000.00      1
- 0.03701463E+02 0.07482931E-02-0.01790173E-05 0.02366368E-09-0.01437037E-13    2
- 0.02155966E+07 0.04108678E+02 0.03118657E+02 0.01553258E-01-0.09487764E-05    3
- 0.01479501E-07-0.09096763E-11 0.02158512E+07 0.07456254E+02                   4
-CN-               121286C   1N   1E   1     G  0200.00   5000.00  1000.00      1
- 0.02981277E+02 0.01464773E-01-0.05672737E-05 0.01017623E-08-0.06870931E-13    2
- 0.06346098E+05 0.06171693E+02 0.03278995E+02 0.01464192E-01-0.03925899E-04    3
- 0.05629875E-07-0.02473497E-10 0.06279509E+05 0.04568972E+02                   4
-CN2               121686C   1N   2          G  0200.00   5000.00  1000.00      1
- 0.05567064E+02 0.02100501E-01-0.09010517E-05 0.01718572E-08-0.01206255E-12    2
- 0.05489968E+06-0.05630054E+02 0.03039964E+02 0.08812105E-01-0.07605508E-04    3
- 0.03554357E-07-0.08746100E-11 0.05563268E+06 0.07555298E+02                   4
-CNN               121286C   1N   2          G  0200.00   5000.00  1000.00      1
- 0.04785930E+02 0.02559554E-01-0.01003133E-04 0.01807149E-08-0.01227383E-12    2
- 0.06870411E+06-0.02953957E+01 0.03524436E+02 0.07271923E-01-0.08272698E-04    3
- 0.05628705E-07-0.01641576E-10 0.06899647E+06 0.05932445E+02                   4
-CNO               103190C   1N   1O   1     G  0200.00   4000.00  1500.00      1
- 0.06328598E+02 0.07390401E-02-0.01110761E-05-0.01846498E-09 0.04400816E-13    2
- 0.04683387E+06-0.09091839E+02 0.03819863E+02 0.06416255E-01-0.05303312E-04    3
- 0.02308211E-07-0.04256414E-11 0.04775979E+06 0.04507300E+02                   4
-CO                121286C   1O   1          G  0200.00   5000.00  1000.00      1
- 0.03025078E+02 0.01442689E-01-0.05630828E-05 0.01018581E-08-0.06910952E-13    2
--0.01426835E+06 0.06108218E+02 0.03262452E+02 0.01511941E-01-0.03881755E-04    3
- 0.05581944E-07-0.02474951E-10-0.01431054E+06 0.04848897E+02                   4
-CO2               121286C   1O   2          G  0200.00   5000.00  1000.00      1
- 0.04453623E+02 0.03140169E-01-0.01278411E-04 0.02393997E-08-0.01669033E-12    2
--0.04896696E+06-0.09553959E+01 0.02275725E+02 0.09922072E-01-0.01040911E-03    3
- 0.06866687E-07-0.02117280E-10-0.04837314E+06 0.01018849E+03                   4
-CO2-              121286C   1O   2E   1     G  0200.00   5000.00  1000.00      1
- 0.04610574E+02 0.02532962E-01-0.01070165E-04 0.02026771E-08-0.01424958E-12    2
--0.05479882E+06 0.01449630E+02 0.02637077E+02 0.07803230E-01-0.08196187E-04    3
- 0.06537897E-07-0.02520220E-10-0.05416773E+06 0.01188955E+03                   4
-COS               121286C   1O   1S   1     G  0200.00   5000.00  1000.00      1
- 0.05191925E+02 0.02506123E-01-0.01024396E-04 0.01943914E-08-0.01370800E-12    2
--0.01846210E+06-0.02825755E+02 0.02858531E+02 0.09515458E-01-0.08884915E-04    3
- 0.04220994E-07-0.08557340E-11-0.01785145E+06 0.09081989E+02                   4
-CS                121686C   1S   1          G  0200.00   5000.00  1000.00      1
- 0.03737431E+02 0.08180451E-02-0.03178918E-05 0.05356801E-09-0.02886195E-13    2
- 0.03247725E+06 0.03576557E+02 0.02938623E+02 0.02724352E-01-0.02397707E-04    3
- 0.01689501E-07-0.06665050E-11 0.03273992E+06 0.07848720E+02                   4
-CS2               121286C   1S   2          G  0200.00   5000.00  1000.00      1
- 0.05930515E+02 0.01813645E-01-0.07492172E-05 0.01445892E-08-0.01032638E-12    2
- 0.01205117E+06-0.06093910E+02 0.03566139E+02 0.08374928E-01-0.06835704E-04    3
- 0.02091214E-07-0.06737193E-12 0.01268848E+06 0.06085967E+02                   4
-CSICL              40992C   1SI  1CL  1     G  0200.00   4000.00  1500.00      1
- 0.06817655E+02 0.02139344E-02-0.01117811E-05 0.02768133E-09-0.02593011E-13    2
- 0.07133105E+06-0.04934821E+02 0.04809756E+02 0.07155653E-01-0.09274105E-04    3
- 0.05368218E-07-0.01150991E-10 0.07182609E+06 0.05089754E+02                   4
-CSICL2             40992C   1SI  1CL  2     G  0200.00   4000.00  1500.00      1
- 0.09603536E+02 0.04212005E-02-0.02008617E-05 0.04653654E-09-0.04174779E-13    2
- 0.04167197E+06-0.01686119E+03 0.05482765E+02 0.01432904E+00-0.01824531E-03    3
- 0.01044588E-06-0.02224179E-10 0.04271677E+06 0.03823593E+02                   4
-CSICL3             40992C   1SI  1CL  3     G  0200.00   4000.00  1500.00      1
- 0.01250544E+03 0.05339218E-02-0.02588613E-05 0.06075307E-09-0.05497769E-13    2
- 0.04346089E+04-0.02851950E+03 0.07246579E+02 0.01837148E+00-0.02348583E-03    3
- 0.01347935E-06-0.02874547E-10 0.01760441E+05-0.02151092E+02                   4
-CSIH2CL            40992H   2C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01027485E+03 0.01774759E-01-0.03308189E-05-0.01554251E-09 0.07008815E-13    2
- 0.04915449E+06-0.02589174E+03 0.02180376E+02 0.02405210E+00-0.02551666E-03    3
- 0.01345591E-06-0.02782039E-10 0.05175432E+06 0.01659754E+03                   4
-CSIHCL             40992H   1C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.08584251E+02 0.09503299E-02-0.01990512E-05 0.07276089E-11 0.02697011E-13    2
- 0.05701632E+06-0.01616263E+03 0.04195792E+02 0.01336658E+00-0.01458110E-03    3
- 0.07822924E-07-0.01632113E-10 0.05839343E+06 0.06755654E+02                   4
-CSIHCL2            40992H   1C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01133022E+03 0.01200867E-01-0.03112842E-05 0.02565133E-09 0.05146234E-14    2
- 0.02764986E+06-0.02737920E+03 0.04205701E+02 0.02278870E+00-0.02653546E-03    3
- 0.01465130E-06-0.03083816E-10 0.02972624E+06 0.09294144E+02                   4
-DIOXANE           103190C   4H   8O   2     G  0200.00   4000.00  1500.00      1
- 0.02168170E+03 0.01049644E+00-0.01053878E-04-0.04473945E-08 0.08168288E-12    2
--0.04922005E+06-0.09955139E+03-0.05862900E+02 0.07081444E+00-0.05458695E-03    3
- 0.02315148E-06-0.04289514E-10-0.03876477E+06 0.05061959E+03                   4
-E                 120186E   1               G  0200.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.07453749E+04-0.01173403E+03 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.07453750E+04-0.01173403E+03                   4
-F                 121286F   1               G  0200.00   5000.00  1000.00      1
- 0.02687459E+02-0.02010358E-02 0.08597957E-06-0.01644974E-09 0.01166160E-13    2
- 0.08722883E+05 0.03882212E+02 0.02913905E+02-0.07336339E-02 0.05571015E-05    3
--0.02666871E-08 0.08643255E-12 0.08651201E+05 0.02677115E+02                   4
-F2                121286F   2               G  0200.00   5000.00  1000.00      1
- 0.04018308E+02 0.06221479E-02-0.02420845E-05 0.04742076E-09-0.03418141E-13    2
--0.01300713E+05 0.01126327E+02 0.02940287E+02 0.03491492E-01-0.02458208E-04    3
- 0.01837073E-08 0.02850917E-11-0.01010430E+05 0.06694194E+02                   4
-F2SINH             42489SI  1N   1F   2H   1G  0200.00   3000.00  1000.00      1
- 0.01004830E+03 0.01983144E-01-0.02703169E-05-0.01767853E-08 0.04444368E-12    2
--0.07739741E+06-0.02303889E+03 0.04951547E+02 0.01329636E+00-0.02098648E-04    3
--0.01007276E-06 0.05552286E-10-0.07597541E+06 0.03690891E+02                   4
-F3SIN              22790F   3SI  1N   1     G  0200.00   4000.00  1000.00      1
- 0.01151242E+03 0.01115029E-01-0.01605465E-05-0.05271933E-09 0.01160900E-12    2
--0.01045919E+07-0.02981224E+03 0.06028419E+02 0.01278681E+00-0.01878856E-04    3
--0.09695426E-07 0.05184848E-10-0.01029950E+07-0.08217831E+01                   4
-FNNF               42489F   2N   2          G  0200.00   3000.00  1000.00      1
- 0.07255211E+02 0.02274410E-01-0.02793346E-05-0.02203844E-08 0.05359234E-12    2
- 0.06360353E+05-0.01094248E+03 0.03127143E+02 0.01057134E+00-0.09746112E-05    3
--0.07208357E-07 0.03567978E-10 0.07615831E+05 0.01107465E+03                   4
-FNO3              121286F   1N   1O   3     G  0200.00   5000.00  1000.00      1
- 0.09176275E+02 0.04219072E-01-0.01835576E-04 0.03553718E-08-0.02541078E-12    2
--0.02118639E+05-0.01934397E+03 0.02985786E+02 0.02094642E+00-0.01652733E-03    3
- 0.04318770E-07 0.01660784E-11-0.04237215E+04 0.01266793E+03                   4
-FO                121286F   1O   1          G  0200.00   5000.00  1000.00      1
- 0.03913735E+02 0.07210714E-02-0.02796614E-05 0.05337821E-09-0.03720184E-13    2
- 0.01180141E+06 0.03346368E+02 0.02879578E+02 0.03399121E-01-0.02572855E-04    3
- 0.07422381E-08-0.04328053E-12 0.01209663E+06 0.08738887E+02                   4
-FO2               121286F   1O   2          G  0200.00   5000.00  1000.00      1
- 0.05678971E+02 0.01442455E-01-0.06229546E-05 0.01199612E-08-0.08543416E-13    2
--0.03861836E+04-0.01941812E+02 0.03872542E+02 0.06409974E-01-0.05517785E-04    3
- 0.02232771E-07-0.03876157E-11 0.01157076E+04 0.07406950E+02                   4
-FSIN               42489SI  1N   1F   1     G  0200.00   3000.00  1000.00      1
- 0.06269572E+02 0.06747867E-02-0.01241976E-05-0.04970158E-09 0.01424452E-12    2
- 0.02533350E+06-0.04201141E+02 0.04269969E+02 0.05298358E-01-0.01103802E-04    3
--0.03962805E-07 0.02282982E-10 0.02587238E+06 0.06215038E+02                   4
-GA                 62987GA  1               G  0200.00   1500.00  0600.00      1
- 0.02679919E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.03368804E+06 0.06788109E+02 0.02679919E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.03368804E+06 0.06788109E+02                   4
-GA2H6              62987GA  2H   6          G  0200.00   1500.00  0600.00      1
- 0.06016247E+02 0.01788370E+00-0.01204229E-05-0.06487881E-07 0.02075367E-10    2
- 0.01312548E+06-0.05228030E+02-0.03914561E+02 0.04965434E+00 0.07401904E-04    3
--0.01124137E-05 0.08726339E-09 0.01493079E+06 0.04274883E+03                   4
-GAAS               62987GA  1AS  1          G  0200.00   1500.00  0600.00      1
- 0.04471149E+02 0.04238449E-02-0.02279405E-05-0.04441172E-10 0.02618952E-12    2
- 0.04313359E+06 0.06212471E+02 0.03967474E+02 0.02318966E-01-0.01145452E-04    3
--0.03411431E-07 0.03365821E-10 0.04321919E+06 0.08599628E+02                   4
-GAAS(3,C)          62987GA  3AS  3          G  0200.00   1500.00  0600.00      1
- 0.01485247E+03 0.02959435E-01-0.07124246E-05-0.05316048E-08 0.01287321E-11    2
- 0.01191262E+07-0.03514144E+03 0.01470189E+03 0.03827728E-01-0.02945747E-04    3
- 0.02465370E-07-0.01520598E-10 0.01191496E+07-0.03445955E+03                   4
-GAAS(3,L)          62987GA  3AS  3          G  0200.00   1500.00  0600.00      1
- 0.01356850E+03 0.02802435E-01-0.07969918E-05-0.06437098E-08 0.01560255E-11    2
- 0.01248005E+07-0.01381063E+03 0.01341276E+03 0.03617689E-01-0.02726209E-04    3
- 0.01877183E-07-0.01259178E-10 0.01248265E+07-0.01309195E+03                   4
-GAAS(5,C)          62987GA  5AS  5          G  0200.00   1500.00  0600.00      1
- 0.02573672E+03 0.05523956E-01-0.01203468E-04-0.01043743E-07 0.02528931E-11    2
- 0.01721381E+07-0.08254488E+03 0.02546512E+03 0.07014337E-01-0.04881356E-04    3
- 0.03825484E-07-0.02450420E-10 0.01721819E+07-0.08130267E+03                   4
-GAAS(5,L)          62987GA  5AS  5          G  0200.00   1500.00  0600.00      1
- 0.03045793E+03 0.05403152E-01-0.01649477E-04-0.09968842E-08 0.02413154E-11    2
- 0.02020691E+07-0.07768010E+03 0.03015255E+03 0.07234394E-01-0.06497994E-04    3
- 0.05559585E-07-0.03339653E-10 0.02021151E+07-0.07630866E+03                   4
-GAET               62987GA  1C   2H   5     G  0200.00   1500.00  0600.00      1
- 0.05932970E+02 0.01342454E+00 0.04110518E-05-0.04286069E-07 0.01238710E-10    2
- 0.06504863E+05 0.03090838E+02 0.01846399E+02 0.02592050E+00 0.05522394E-04    3
--0.04977960E-06 0.03654362E-09 0.07264445E+05 0.02294639E+03                   4
-GAET2              62987GA  1C   4H  10     G  0200.00   1500.00  0600.00      1
- 0.07213832E+02 0.03055228E+00 0.01249451E-04-0.09990274E-07 0.02881966E-10    2
--0.01392119E+05-0.07795098E+00-0.02162930E+02 0.05892512E+00 0.01447145E-03    3
--0.01168602E-05 0.08526654E-09 0.03561841E+04 0.04552626E+03                   4
-GAET3              62987GA  1C   6H  15     G  0200.00   1500.00  0600.00      1
- 0.08436453E+02 0.04804950E+00 0.02119157E-04-0.01581685E-06 0.04571178E-10    2
--0.01346996E+06-0.06196490E+02-0.06544289E+02 0.09332246E+00 0.02364121E-03    3
--0.01874104E-05 0.01367721E-08-0.01067659E+06 0.06666796E+03                   4
-GAH                62987GA  1H   1          G  0200.00   1500.00  0600.00      1
- 0.03232142E+02 0.01343247E-01-0.04325499E-06-0.02791841E-08 0.04973590E-12    2
- 0.02656060E+06 0.05947896E+02 0.03524579E+02 0.03386213E-02-0.02064014E-05    3
- 0.03220999E-07-0.02936132E-10 0.02651074E+06 0.04554067E+02                   4
-GAH2               62987GA  1H   2          G  0200.00   1500.00  0600.00      1
- 0.03762385E+02 0.03210792E-01 0.02180096E-06-0.08908393E-08 0.02219063E-11    2
- 0.01936647E+06 0.05783398E+02 0.03559710E+02 0.03676742E-01 0.06484499E-05    3
--0.03109349E-07 0.01585414E-10 0.01940976E+06 0.06803082E+02                   4
-GAH3               62987GA  1H   3          G  0200.00   1500.00  0600.00      1
- 0.03345476E+02 0.06399313E-01 0.01122996E-05-0.02065900E-07 0.05780202E-11    2
- 0.01228185E+06 0.06394842E+02 0.01726154E+02 0.01124739E+00 0.02447527E-04    3
--0.02026314E-06 0.01447000E-09 0.01258620E+06 0.01428445E+03                   4
-GAME               62987GA  1C   1H   3     G  0200.00   1500.00  0600.00      1
- 0.04809857E+02 0.06824207E-01 0.02258235E-05-0.02018341E-07 0.05736453E-11    2
- 0.07558677E+05 0.02595904E+02 0.03054537E+02 0.01218640E+00 0.02332213E-04    3
--0.02121866E-06 0.01544226E-09 0.07885869E+05 0.01112878E+03                   4
-GAME2              62987GA  1C   2H   6     G  0200.00   1500.00  0600.00      1
- 0.07068373E+02 0.01421602E+00 0.05120694E-05-0.04421986E-07 0.01309641E-10    2
- 0.05453790E+05-0.04173960E+02 0.02257655E+02 0.02916446E+00 0.05669861E-04    3
--0.05709755E-06 0.04268905E-09 0.06341297E+05 0.01915435E+03                   4
-GAME3              62987GA  1C   3H   9     G  0200.00   1500.00  0600.00      1
- 0.08410636E+02 0.02262803E+00 0.01043019E-04-0.07049611E-07 0.02015308E-10    2
--0.09087271E+05-0.01072250E+03 0.02120239E+02 0.04161029E+00 0.09959505E-04    3
--0.07846792E-06 0.05693396E-09-0.07911968E+05 0.01988516E+03                   4
-H                 120186H   1               G  0200.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.02547163E+06-0.04601176E+01 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.02547163E+06-0.04601176E+01                   4
-H(CH3)SICH2        61991H   6C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.01254527E+03 0.07143719E-01-0.01146987E-05-0.08100963E-08 0.01568740E-11    2
- 0.07723628E+05-0.04075435E+03 0.01206249E+02 0.03587271E+00-0.02971970E-03    3
- 0.01379675E-06-0.02695736E-10 0.01156328E+06 0.01956017E+03                   4
-H+                120186H   1E  -1          G  0200.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.01840334E+07-0.01153862E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.01840334E+07-0.01153862E+02                   4
-H-                120186H   1E   1          G  0200.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.01596104E+06-0.01152449E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.01596104E+06-0.01152449E+02                   4
-H2                121286H   2               G  0200.00   5000.00  1000.00      1
- 0.02991423E+02 0.07000644E-02-0.05633829E-06-0.09231578E-10 0.01582752E-13    2
--0.08350340E+04-0.01355110E+02 0.03298124E+02 0.08249442E-02-0.08143015E-05    3
--0.09475434E-09 0.04134872E-11-0.01012521E+05-0.03294094E+02                   4
-H2ALME             62987AL  1C   1H   5     G  0200.00   1500.00  0600.00      1
- 0.04898410E+02 0.01358223E+00 0.02611459E-05-0.04575170E-07 0.01384802E-10    2
- 0.08743072E+04-0.01113117E+02-0.06283259E+01 0.03089531E+00 0.05774090E-04    3
--0.06488033E-06 0.04907111E-09 0.01889334E+05 0.02565779E+03                   4
-H2ASME             62987AS  1C   1H   5     G  0200.00   1500.00  0600.00      1
- 0.05686213E+02 0.02154422E+00 0.08185248E-05-0.07069951E-07 0.02101522E-10    2
- 0.09331084E+05-0.06513957E+02-0.02113506E+02 0.04564229E+00 0.09983227E-04    3
--0.09399697E-06 0.07014021E-09 0.01077170E+06 0.03132611E+03                   4
-H2C4O             120189H   2C   4O   1     G  0200.00   4000.00  1000.00      1
- 0.01026888E+03 0.04896164E-01-0.04885081E-05-0.02708566E-08 0.05107013E-12    2
- 0.02346903E+06-0.02815985E+03 0.04810971E+02 0.01313999E+00 0.09865073E-05    3
--0.06120720E-07 0.01640003E-10 0.02545803E+06 0.02113424E+02                   4
-H2CCC             102093H   2C   3          G  0200.00   4000.00  1400.00      1
- 0.08266525E+02 0.02728619E-01-0.02160829E-05-0.01515161E-08 0.02641695E-12    2
- 0.07757192E+06-0.01864937E+03 0.04212193E+02 0.08954521E-01-0.01050721E-04    3
--0.02578513E-07 0.09722836E-11 0.07922349E+06 0.04134299E+02                   4
-H2CCC(S)          102093H   2C   3          G  0200.00   4000.00  1400.00      1
- 0.07904213E+02 0.02907464E-01-0.02219731E-05-0.01620844E-08 0.02796013E-12    2
- 0.06385167E+06-0.01810882E+03 0.03794178E+02 0.08761049E-01-0.07975878E-05    3
--0.02308045E-07 0.07911151E-11 0.06563580E+06 0.05264196E+02                   4
-H2CCCCCH          101993H   3C   5          G  0200.00   4000.00  1400.00      1
- 0.01440736E+03 0.04424058E-01-0.03618245E-05-0.02456408E-08 0.04327859E-12    2
- 0.05896103E+06-0.04775145E+03 0.07441421E+02 0.01585165E+00-0.02219895E-04    3
--0.04928038E-07 0.01984559E-10 0.06162266E+06-0.09047891E+02                   4
-H2CCCCH            82489C   4H   3          G  0200.00   4000.00  1000.00      1
- 0.01131409E+03 0.05014414E-01-0.05350445E-05-0.02825309E-08 0.05403279E-12    2
- 0.05181211E+06-0.03062434E+03 0.06545799E+02 0.01242477E+00 0.05603226E-05    3
--0.05631141E-07 0.01665218E-10 0.05352503E+06-0.04264082E+02                   4
-H2CCCCH2           82489C   4H   4          G  0200.00   4000.00  1000.00      1
- 0.01062083E+03 0.07199370E-01-0.06806234E-05-0.04021185E-08 0.07378498E-12    2
- 0.03358798E+06-0.03193583E+03 0.03849007E+02 0.01713169E+00 0.01644270E-04    3
--0.07761590E-07 0.01947860E-10 0.03608372E+06 0.05732121E+02                   4
-H2CCCH             82489C   3H   3          G  0200.00   4000.00  1000.00      1
- 0.08831047E+02 0.04357195E-01-0.04109067E-05-0.02368723E-08 0.04376520E-12    2
- 0.03847420E+06-0.02177919E+03 0.04754200E+02 0.01108028E+00 0.02793323E-05    3
--0.05479212E-07 0.01949629E-10 0.03988883E+06 0.05854549E+01                   4
-H2CCCLO            53090C   2H   2O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.01240462E+03 0.02067658E-01-0.03889952E-05-0.03138121E-10 0.04625008E-13    2
--0.01114503E+06-0.03928723E+03 0.01680422E+02 0.03020642E+00-0.03234256E-03    3
- 0.01779343E-06-0.03877221E-10-0.07395297E+05 0.01777265E+03                   4
-H2CCH(SICL2H)      40992H   4C   2SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01680247E+03 0.04516342E-01-0.05794312E-05-0.01367868E-08 0.02833862E-12    2
--0.04037858E+06-0.05763375E+03 0.03640801E+02 0.03803764E+00-0.03641732E-03    3
- 0.01855101E-06-0.03834642E-10-0.03581475E+06 0.01252145E+03                   4
-H2CCH2OH          103190C   2H   5O   1     G  0200.00   4000.00  1500.00      1
- 0.01144956E+03 0.05249185E-01-0.04887850E-05-0.02243250E-08 0.03973360E-12    2
--0.07554972E+05-0.03426083E+03 0.01304406E+02 0.02873214E+00-0.02387448E-03    3
- 0.01166988E-06-0.02450027E-10-0.03718933E+05 0.02078756E+03                   4
-H2CCHO            103190C   2H   3O   1     G  0200.00   4000.00  1500.00      1
- 0.09710060E+02 0.03854966E-01-0.04677825E-05-0.01505179E-08 0.02941428E-12    2
--0.02692492E+05-0.02810566E+03 0.02802205E+01 0.02740311E+00-0.02554683E-03    3
- 0.01306679E-06-0.02750425E-10 0.06682648E+04 0.02239731E+03                   4
-H2CCHSI            61991H   3C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.09386889E+02 0.03941784E-01-0.01316150E-05-0.04081553E-08 0.07971026E-12    2
- 0.04528924E+06-0.02340680E+03 0.01645904E+02 0.02461474E+00-0.02252401E-03    3
- 0.01105892E-06-0.02209069E-10 0.04779814E+06 0.01738303E+03                   4
-H2CCHSIH           61991H   4C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.01039415E+03 0.04987864E-01-0.01480904E-05-0.05650110E-08 0.01139073E-11    2
- 0.03263919E+06-0.02930385E+03 0.01989225E+02 0.02637566E+00-0.02197547E-03    3
- 0.09982490E-07-0.01893595E-10 0.03544082E+06 0.01531216E+03                   4
-H2CCHSIH2          61991H   5C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.01289871E+03 0.05366252E-01-0.02345064E-05-0.05622057E-08 0.01143224E-11    2
- 0.02373919E+06-0.04346106E+03 0.04606628E+01 0.03824847E+00-0.03490747E-03    3
- 0.01656684E-06-0.03180820E-10 0.02773639E+06 0.02208512E+03                   4
-H2CCHSIH3          61991H   6C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.01249653E+03 0.07666553E-01-0.02075339E-05-0.09569749E-08 0.01987112E-11    2
- 0.04799029E+05-0.04174850E+03 0.07686183E+01 0.03576322E+00-0.02634364E-03    3
- 0.01032868E-06-0.01717329E-10 0.08811836E+05 0.02100703E+03                   4
-H2CLSICH3          40992H   5C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01354344E+03 0.04577293E-01-0.04988032E-05-0.01758807E-08 0.03311232E-12    2
--0.03126783E+06-0.04541432E+03 0.02142669E+02 0.03103477E+00-0.02660368E-03    3
- 0.01286599E-06-0.02646554E-10-0.02699973E+06 0.01636317E+03                   4
-H2CLSISICL3        40992H   2SI  2CL  4     G  0200.00   4000.00  1500.00      1
- 0.01871701E+03 0.01924360E-01-0.04472779E-05 0.02003132E-09 0.03268818E-13    2
--0.08047111E+06-0.05817685E+03 0.08945602E+02 0.03068227E+00-0.03483212E-03    3
- 0.01910354E-06-0.04027623E-10-0.07751434E+06-0.07537633E+02                   4
-H2CN               41687H   2C   1N   1     G  0200.00   4000.00  1000.00      1
- 0.05209703E+02 0.02969291E-01-0.02855589E-05-0.01635550E-08 0.03043259E-12    2
- 0.02767711E+06-0.04444478E+02 0.02851661E+02 0.05695233E-01 0.01071140E-04    3
--0.01622612E-07-0.02351108E-11 0.02863782E+06 0.08992751E+02                   4
-H2CNCH2           103190C   2H   4N   1     G  0200.00   4000.00  1500.00      1
- 0.01065385E+03 0.05191287E-01-0.05816522E-05-0.02206912E-08 0.04101341E-12    2
- 0.02345063E+06-0.03469895E+03-0.01203076E+01 0.03225369E+00-0.02968723E-03    3
- 0.01527290E-06-0.03242500E-10 0.02728820E+06 0.02297042E+03                   4
-H2CNCH2O          103190C   2H   4N   1O   1G  0200.00   4000.00  1500.00      1
- 0.01327652E+03 0.04830938E-01-0.04858949E-05-0.02009495E-08 0.03640181E-12    2
- 0.01624962E+06-0.04713094E+03-0.01978522E+01 0.03341279E+00-0.02432022E-03    3
- 0.09438643E-07-0.01604050E-10 0.02141154E+06 0.02658265E+03                   4
-H2CNCHO           103190C   2H   3N   1O   1G  0200.00   4000.00  1500.00      1
- 0.01196792E+03 0.03915428E-01-0.03860933E-05-0.01696877E-08 0.03041050E-12    2
--0.05902236E+05-0.03958545E+03 0.01096066E+02 0.02577215E+00-0.01711630E-03    3
- 0.05880104E-07-0.08956774E-11-0.01612063E+05 0.02032528E+03                   4
-H2CNH              41687C   1H   3N   1     G  0200.00   4000.00  1000.00      1
- 0.05221589E+02 0.04748526E-01-0.04179159E-05-0.02606612E-08 0.04703140E-12    2
- 0.08657219E+05-0.04500776E+02 0.02365879E+02 0.06780570E-01 0.02423000E-04    3
--0.06157824E-08-0.01615097E-10 0.09971141E+05 0.01230718E+03                   4
-H2CNNHO           103190C   1H   3N   2O   1G  0200.00   4000.00  1500.00      1
- 0.01157754E+03 0.04489180E-01-0.05033233E-05-0.01651066E-08 0.03069139E-12    2
- 0.01986783E+06-0.03656958E+03 0.05954945E+01 0.03239559E+00-0.02993966E-03    3
- 0.01489054E-06-0.03022863E-10 0.02364485E+06 0.02192790E+03                   4
-H2CNNO            103190C   1H   2N   2O   1G  0200.00   4000.00  1500.00      1
- 0.01016234E+03 0.03065936E-01-0.03082820E-05-0.01194424E-08 0.02169867E-12    2
- 0.02494088E+06-0.02762275E+03 0.02498334E+02 0.01993009E+00-0.01557879E-03    3
- 0.06838956E-07-0.01313250E-10 0.02786476E+06 0.01417025E+03                   4
-H2CNNO2            41687H   2C   1N   2O   2G  0200.00   4000.00  1000.00      1
- 0.01140794E+03 0.04564542E-01-0.04600304E-05-0.02513539E-08 0.04782211E-12    2
- 0.01242142E+06-0.03165238E+03 0.03534317E+02 0.01811272E+00 0.02394018E-05    3
--0.01080024E-06 0.04222725E-10 0.01509006E+06 0.01131138E+03                   4
-H2CNO             103190C   1H   2N   1O   1G  0200.00   4000.00  1500.00      1
- 0.08485639E+02 0.02633277E-01-0.03017498E-05-0.08341916E-09 0.01593977E-12    2
- 0.01716434E+06-0.02052156E+03 0.01045856E+02 0.02126494E+00-0.01962754E-03    3
- 0.09659592E-07-0.01941069E-10 0.01974611E+06 0.01919718E+03                   4
-H2CNO2            103190C   1H   2N   1O   2G  0200.00   4000.00  1500.00      1
- 0.01127481E+03 0.02584711E-01-0.03934331E-05-0.05614969E-09 0.01392400E-12    2
- 0.01360470E+06-0.03461951E+03 0.01165696E+02 0.02890490E+00-0.02817663E-03    3
- 0.01387569E-06-0.02727595E-10 0.01694546E+06 0.01888293E+03                   4
-H2CONO            103190C   1H   2N   1O   2G  0200.00   4000.00  1500.00      1
- 0.01075754E+03 0.02983288E-01-0.04123564E-05-0.08096724E-09 0.01720195E-12    2
- 0.01230253E+06-0.02976009E+03 0.02120026E+02 0.02709056E+00-0.02799616E-03    3
- 0.01479145E-06-0.03074997E-10 0.01504327E+06 0.01546092E+03                   4
-H2GAET             62987GA  1C   2H   7     G  0200.00   1500.00  0600.00      1
- 0.07187273E+02 0.01867211E+00 0.06156157E-05-0.06027764E-07 0.01797524E-10    2
--0.04232757E+05-0.04686699E+02 0.04124020E+01 0.03972972E+00 0.07979140E-04    3
--0.08059234E-06 0.06040387E-09-0.02983932E+05 0.02816148E+03                   4
-H2GAME             62987GA  1C   1H   5     G  0200.00   1500.00  0600.00      1
- 0.05831604E+02 0.01222872E+00 0.03033669E-05-0.03956941E-07 0.01225452E-10    2
- 0.05189255E+05-0.04446614E+02 0.05251130E+01 0.02904695E+00 0.04844148E-04    3
--0.06097646E-06 0.04672763E-09 0.06158712E+05 0.02122149E+03                   4
-H2NF               42489H   2N   1F   1     G  0200.00   3000.00  1000.00      1
- 0.04143658E+02 0.03805135E-01-0.02771153E-05-0.03589717E-08 0.07589549E-12    2
--0.04891486E+05 0.02309362E+02 0.02597863E+02 0.05882104E-01 0.04938351E-05    3
--0.01948600E-07 0.03634003E-11-0.04301253E+05 0.01098289E+03                   4
-H2NNO             103190H   2N   2O   1     G  0200.00   4000.00  1500.00      1
- 0.07759737E+02 0.03025701E-01-0.02888916E-05-0.01262990E-08 0.02195026E-12    2
- 0.05894193E+05-0.01647713E+03 0.02088916E+02 0.01684997E+00-0.01428977E-03    3
- 0.06830147E-07-0.01368985E-10 0.07907340E+05 0.01394381E+03                   4
-H2NO              102290H   2N   1O   1     G  0200.00   4000.00  1500.00      1
- 0.05673346E+02 0.02298837E-01-0.01774446E-05-0.01103482E-08 0.01859762E-12    2
- 0.05569325E+05-0.06153540E+02 0.02530590E+02 0.08596035E-01-0.05471030E-04    3
- 0.02276249E-07-0.04648073E-11 0.06868030E+05 0.01126651E+03                   4
-H2NOH             103190H   3N   1O   1     G  0200.00   4000.00  1500.00      1
- 0.06764633E+02 0.03047036E-01-0.02777798E-05-0.01250487E-08 0.02191094E-12    2
--0.09026701E+05-0.01269845E+03 0.01407003E+02 0.01658498E+00-0.01463594E-03    3
- 0.07318354E-07-0.01511897E-10-0.07158596E+05 0.01589649E+03                   4
-H2O                20387H   2O   1          G  0200.00   5000.00  1000.00      1
- 0.02672146E+02 0.03056293E-01-0.08730260E-05 0.01200996E-08-0.06391618E-13    2
--0.02989921E+06 0.06862817E+02 0.03386842E+02 0.03474982E-01-0.06354696E-04    3
- 0.06968581E-07-0.02506588E-10-0.03020811E+06 0.02590233E+02                   4
-H2O(L)            120186H   2O   1          L  0273.15   1000.00  1000.00      1
- 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.00000000E+00 0.00000000E+00 0.01271278E+03-0.01766279E+00-0.02255666E-03    3
- 0.02082091E-05-0.02407861E-08-0.03748320E+06-0.05911535E+03                   4
-H2O(S)            120186H   2O   1          S  0200.00   0273.15  0273.15      1
- 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.00000000E+00 0.00000000E+00-0.03926933E+00 0.01692042E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.03594958E+06 0.05693378E+01                   4
-H2O2              120186H   2O   2          G  0200.00   5000.00  1000.00      1
- 0.04573167E+02 0.04336136E-01-0.01474689E-04 0.02348904E-08-0.01431654E-12    2
--0.01800696E+06 0.05011370E+01 0.03388754E+02 0.06569226E-01-0.01485013E-05    3
--0.04625806E-07 0.02471515E-10-0.01766315E+06 0.06785363E+02                   4
-H2S               121286H   2S   1          G  0200.00   5000.00  1000.00      1
- 0.02883147E+02 0.03827835E-01-0.01423398E-04 0.02497999E-08-0.01660273E-12    2
--0.03480743E+05 0.07258162E+02 0.03071029E+02 0.05578261E-01-0.01030967E-03    3
- 0.01201953E-06-0.04838370E-10-0.03559826E+05 0.05935226E+02                   4
-H2SI(CH3)2         61991H   8C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.01362000E+03 0.01024457E+00-0.01528107E-05-0.01329179E-07 0.02717974E-11    2
--0.01781386E+06-0.04695844E+03 0.02005893E+02 0.03638380E+00-0.02273374E-03    3
- 0.07691266E-07-0.01156681E-10-0.01364280E+06 0.01583265E+03                   4
-H2SI(CH3)CH2       61991H   7C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.01388829E+03 0.07937538E-01-0.01559644E-05-0.09324826E-08 0.01847251E-11    2
- 0.06767195E+05-0.04464997E+03 0.01980449E+02 0.03727036E+00-0.02944759E-03    3
- 0.01312558E-06-0.02507859E-10 0.01087973E+06 0.01898102E+03                   4
-H2SI(NH2)2         22790SI  1H   6N   2     G  0200.00   4000.00  1000.00      1
- 0.01302179E+03 0.06465444E-01-0.05816746E-05-0.03484493E-08 0.06340675E-12    2
--0.02357071E+06-0.04132570E+03 0.05615307E+02 0.02079854E+00-0.09999530E-05    3
--0.01288525E-06 0.06091866E-10-0.02126283E+06-0.01615658E+02                   4
-H2SIC              61991H   2C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.07319671E+02 0.01729952E-01-0.01346466E-05-0.01450487E-08 0.03000643E-12    2
- 0.08125478E+06-0.01320432E+03 0.02408167E+02 0.01437372E+00-0.01331203E-03    3
- 0.06387472E-07-0.01244523E-10 0.08289031E+06 0.01283748E+03                   4
-H2SICCH            61991H   3C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.01091422E+03 0.03001577E-01-0.01622344E-05-0.02466767E-08 0.04595260E-12    2
- 0.04137118E+06-0.03153165E+03 0.02952641E+02 0.02407857E+00-0.02313898E-03    3
- 0.01172227E-06-0.02393835E-10 0.04400800E+06 0.01054929E+03                   4
-H2SICH             61991H   3C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.08489276E+02 0.02348812E-01-0.01091163E-05-0.02027972E-08 0.03759264E-12    2
- 0.04973382E+06-0.01845097E+03 0.03442743E+02 0.01542521E+00-0.01429096E-03    3
- 0.07252204E-07-0.01507009E-10 0.05145786E+06 0.08363421E+02                   4
-H2SICH2            61991H   4C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.09303939E+02 0.04006038E-01-0.09702324E-06-0.03997739E-08 0.07350215E-12    2
- 0.01649066E+06-0.02623845E+03 0.01049782E+02 0.02562277E+00-0.02324392E-03    3
- 0.01142315E-06-0.02295441E-10 0.01922778E+06 0.01743860E+03                   4
-H2SICH3            61991H   5C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.08991115E+02 0.06006339E-01-0.01118591E-05-0.07745983E-08 0.01594429E-11    2
- 0.01270233E+06-0.02218700E+03 0.02094419E+02 0.02127010E+00-0.01294390E-03    3
- 0.04156964E-07-0.05854213E-11 0.01520143E+06 0.01518517E+03                   4
-H2SIN              22790H   2SI  1N   1     G  0200.00   4000.00  1000.00      1
- 0.06826533E+02 0.02125460E-01-0.02343132E-05-0.01166339E-08 0.02277273E-12    2
- 0.07253673E+06-0.01052162E+03 0.03549344E+02 0.07311005E-01 0.03249026E-05    3
--0.03682945E-07 0.01121511E-10 0.07370656E+06 0.07565329E+02                   4
-H2SINH             42489SI  1N   1H   3     G  0200.00   3000.00  1000.00      1
- 0.06588295E+02 0.04903194E-01-0.04944720E-05-0.05014630E-08 0.01139470E-11    2
- 0.01809794E+06-0.09522970E+02 0.02822196E+02 0.01245518E+00-0.08350819E-05    3
--0.07411814E-07 0.03579019E-10 0.01923616E+06 0.01054783E+03                   4
-H2SINH2            42489SI  1N   1H   4     G  0200.00   3000.00  1000.00      1
- 0.07392047E+02 0.05476841E-01-0.04453276E-05-0.05236661E-08 0.01138390E-11    2
- 0.01136858E+06-0.01138050E+03 0.04053223E+02 0.01182231E+00-0.04348128E-05    3
--0.06225818E-07 0.02798829E-10 0.01241971E+06 0.06562033E+02                   4
-H2SINH3           121386SI  1H   5N   1     G  0200.00   4000.00  1000.00      1
- 0.08711392E+02 0.05909106E-01-0.05436615E-05-0.03248350E-08 0.05960257E-12    2
- 0.08441694E+05-0.01933470E+03 0.04269730E+02 0.01125224E+00 0.01951722E-04    3
--0.03578373E-07-0.08372202E-12 0.01022204E+06 0.05876736E+02                   4
-H2SISIH2           42489SI  2H   4          G  0200.00   3000.00  1000.00      1
- 0.08986817E+02 0.05405047E-01-0.05214022E-05-0.05313742E-08 0.01188727E-11    2
- 0.02832748E+06-0.02004478E+03 0.05133186E+02 0.01252855E+00-0.04620421E-05    3
--0.06606075E-07 0.02864345E-10 0.02956915E+06 0.07605133E+01                   4
-H3ASGAET3          62987AS  1GA  1C   6H  18G  0200.00   1500.00  0600.00      1
- 0.08508501E+02 0.05632369E+00 0.02524140E-04-0.01861451E-06 0.05372403E-10    2
--0.01085517E+06-0.03399858E+02-0.08974745E+02 0.01090516E+01 0.02811457E-03    3
--0.02195513E-05 0.01599734E-08-0.07592761E+05 0.08165459E+03                   4
-H3ASGAME3          62987AS  1GA  1C   3H  12G  0200.00   1500.00  0600.00      1
- 0.01125499E+03 0.03159753E+00 0.01177904E-04-0.01013352E-06 0.02947356E-10    2
--0.07280344E+05-0.02238730E+03 0.01267161E+02 0.06214586E+00 0.01385631E-03    3
--0.01220044E-05 0.08982019E-09-0.05425619E+05 0.02613306E+03                   4
-H3CONHO           103190C   1H   4N   1O   2G  0200.00   4000.00  1500.00      1
- 0.01249270E+03 0.04773900E-01-0.04717255E-05-0.01987935E-08 0.03599460E-12    2
--0.02354754E+05-0.03945442E+03 0.01930733E+02 0.02865910E+00-0.02313063E-03    3
- 0.01068402E-06-0.02139376E-10 0.01638891E+05 0.01796108E+03                   4
-H3SIC              61991H   3C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.08536022E+02 0.02944748E-01-0.01752614E-05-0.03061316E-08 0.06463710E-12    2
- 0.07066730E+06-0.02041360E+03 0.01037017E+02 0.02192253E+00-0.01926062E-03    3
- 0.08725014E-07-0.01615505E-10 0.07315849E+06 0.01939904E+03                   4
-H3SICCH            61991H   4C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.01193845E+03 0.04298239E-01-0.01882154E-05-0.04212272E-08 0.08245783E-12    2
- 0.02161639E+06-0.03978125E+03 0.01692389E+02 0.03078862E+00-0.02808630E-03    3
- 0.01359918E-06-0.02690423E-10 0.02503587E+06 0.01453670E+03                   4
-H3SICH             61991H   4C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.09747808E+02 0.03532863E-01-0.01540271E-05-0.03539077E-08 0.06992248E-12    2
- 0.04253036E+06-0.02504347E+03 0.01710027E+02 0.02413212E+00-0.02164005E-03    3
- 0.01035470E-06-0.02035579E-10 0.04522928E+06 0.01762908E+03                   4
-H3SICH2            61991H   5C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.01050164E+03 0.04907525E-01-0.01523178E-05-0.05436598E-08 0.01082455E-11    2
- 0.01632252E+06-0.02911264E+03 0.01199673E+02 0.02828259E+00-0.02394311E-03    3
- 0.01103518E-06-0.02125819E-10 0.01948167E+06 0.02041804E+03                   4
-H3SICH3            61991H   6C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.01022214E+03 0.07221275E-01-0.01482544E-05-0.09419140E-08 0.01956175E-11    2
--0.08301660E+05-0.03163487E+03 0.01240228E+02 0.02729962E+00-0.01707597E-03    3
- 0.05502474E-07-0.07521465E-11-0.05090007E+05 0.01692759E+03                   4
-H3SIN              22790H   3SI  1N   1     G  0200.00   4000.00  1000.00      1
- 0.07964213E+02 0.03355633E-01-0.03579695E-05-0.01889818E-08 0.03650912E-12    2
- 0.01148697E+07-0.01924110E+03 0.02790629E+02 0.01134566E+00 0.08321879E-05    3
--0.05845045E-07 0.01685969E-10 0.01167357E+07 0.09384630E+02                   4
-H3SINH             42489SI  1N   1H   4     G  0200.00   3000.00  1000.00      1
- 0.07697340E+02 0.05657943E-01-0.05209306E-05-0.05617966E-08 0.01263502E-11    2
- 0.02282005E+06-0.01330379E+03 0.02778390E+02 0.01510711E+00-0.06734261E-05    3
--0.08928515E-07 0.04115347E-10 0.02435913E+06 0.01309386E+03                   4
-H3SISIH           111191H   4SI  2          G  0200.00   4000.00  1500.00      1
- 0.01127202E+03 0.02538145E-01-0.02998472E-05-0.09465367E-09 0.01855053E-12    2
- 0.03297169E+06-0.03264598E+03 0.03698707E+02 0.01870180E+00-0.01430704E-03    3
- 0.06005836E-07-0.01116293E-10 0.03590825E+06 0.08825191E+02                   4
-H3SISIH3           42489SI  2H   6          G  0200.00   3000.00  1000.00      1
- 0.01068273E+03 0.08221416E-01-0.08096035E-05-0.08337975E-08 0.01908205E-11    2
- 0.05316920E+05-0.03082188E+03 0.03898290E+02 0.01977415E+00 0.01791014E-05    3
--0.01033168E-06 0.03931699E-10 0.07621719E+05 0.06227022E+02                   4
-HALME              62987AL  1C   1H   4     G  0200.00   1500.00  0600.00      1
- 0.04812273E+02 0.01029645E+00 0.02582808E-05-0.03323597E-07 0.09884584E-11    2
- 0.01176673E+06 0.09557062E+01 0.01118789E+02 0.02180038E+00 0.04120785E-04    3
--0.04366690E-06 0.03273825E-09 0.01244736E+06 0.01886107E+03                   4
-HALME2             62987AL  1C   2H   7     G  0200.00   1500.00  0600.00      1
- 0.05705172E+02 0.01924317E+00 0.06377855E-05-0.06346800E-07 0.01896800E-10    2
--0.06049865E+05-0.06331378E+01-0.01494261E+02 0.04158568E+00 0.08686772E-04    3
--0.08604142E-06 0.06447653E-09-0.04722517E+05 0.03427725E+03                   4
-HASALME            62987AS  1AL  1C   1H   4G  0200.00   1500.00  0600.00      1
- 0.06956539E+02 0.01061278E+00 0.02440154E-05-0.03297737E-07 0.01020004E-10    2
- 0.02582506E+06-0.08625792E+01 0.02544859E+02 0.02465795E+00 0.03677808E-04    3
--0.05008894E-06 0.03848384E-09 0.02663010E+06 0.02046859E+03                   4
-HASGAET            62987AS  1GA  1C   2H   6G  0200.00   1500.00  0600.00      1
- 0.06336445E+02 0.02340603E+00 0.09066638E-05-0.07519059E-07 0.01828115E-10    2
- 0.03184605E+06 0.05812180E+02 0.05642724E+02 0.02296739E+00 0.01094867E-03    3
--0.02449038E-06 0.09602701E-10 0.03204718E+06 0.09675533E+02                   4
-HASGAME            62987AS  1GA  1C   1H   4G  0200.00   1500.00  0600.00      1
- 0.07507970E+02 0.09277900E-01 0.01891932E-05-0.02769887E-07 0.07996070E-11    2
- 0.03253908E+06-0.01422608E+02 0.04859127E+02 0.01750423E+00 0.02831996E-04    3
--0.03107937E-06 0.02299468E-09 0.03302941E+06 0.01142952E+03                   4
-HASME              62987AS  1C   1H   4     G  0200.00   1500.00  0600.00      1
- 0.05753261E+02 0.01841813E+00 0.07493313E-05-0.05919917E-07 0.01726247E-10    2
- 0.01880057E+06-0.05360325E+02-0.01575095E+01 0.03649094E+00 0.08332940E-04    3
--0.07234666E-06 0.05330928E-09 0.01989792E+06 0.02335316E+03                   4
-HASME2             62987AS  1C   2H   7     G  0200.00   1500.00  0600.00      1
- 0.05850437E+02 0.01841766E+00 0.08066845E-05-0.05868715E-07 0.01726428E-10    2
- 0.06450535E+05 0.03909152E+01-0.02908405E+01 0.03729577E+00 0.08335855E-04    3
--0.07455611E-06 0.05527881E-09 0.07587766E+05 0.03020451E+03                   4
-HCCCHCCH          101993H   3C   5          G  0200.00   4000.00  1400.00      1
- 0.01412247E+03 0.04593411E-01-0.03738175E-05-0.02574329E-08 0.04539160E-12    2
- 0.06249257E+06-0.04722335E+03 0.06854796E+02 0.01699404E+00-0.02582284E-04    3
--0.05488765E-07 0.02281481E-10 0.06515364E+06-0.07133854E+02                   4
-HCCCL              40992H   1C   2CL  1     G  0200.00   4000.00  1500.00      1
- 0.07743241E+02 0.01618655E-01-0.02465935E-05-0.02909336E-09 0.07522752E-13    2
- 0.02472494E+06-0.01686593E+03 0.02969338E+02 0.01583152E+00-0.01787078E-03    3
- 0.01017728E-06-0.02231985E-10 0.02620733E+06 0.07906791E+02                   4
-HCCHCCH            82489C   4H   3          G  0200.00   4000.00  1000.00      1
- 0.01075274E+03 0.05381153E-01-0.05549638E-05-0.03052266E-08 0.05761740E-12    2
- 0.06121419E+06-0.02973025E+03 0.04153882E+02 0.01726287E+00-0.02389374E-05    3
--0.01018700E-06 0.04340505E-10 0.06338071E+06 0.06036507E+02                   4
-HCCO               32387H   1C   2O   1     G  0200.00   4000.00  1000.00      1
- 0.06758073E+02 0.02000400E-01-0.02027607E-05-0.01041132E-08 0.01965165E-12    2
- 0.01901513E+06-0.09071262E+02 0.05047965E+02 0.04453478E-01 0.02268283E-05    3
--0.01482095E-07 0.02250742E-11 0.01965892E+06 0.04818439E+01                   4
-HCCOH              32387H   2C   2O   1     G  0200.00   4000.00  1000.00      1
- 0.07328324E+02 0.03336416E-01-0.03024705E-05-0.01781106E-08 0.03245168E-12    2
- 0.07598258E+05-0.01401214E+03 0.03899465E+02 0.09701075E-01-0.03119309E-05    3
--0.05537732E-07 0.02465732E-10 0.08701190E+05 0.04491875E+02                   4
-HCCSICL2H          40992H   2C   2SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01480501E+03 0.02600965E-01-0.04631204E-05-0.02401379E-09 0.09812397E-13    2
--0.02163059E+06-0.04610236E+03 0.04846840E+02 0.03181717E+00-0.03572068E-03    3
- 0.01983339E-06-0.04248036E-10-0.01856223E+06 0.05613645E+02                   4
-HCL                42189CL  1H   1          G  0200.00   5000.00  1000.00      1
- 0.02755335E+02 0.01473581E-01-0.04971254E-05 0.08108658E-09-0.05072063E-13    2
--0.01191806E+06 0.06515116E+02 0.03338534E+02 0.01268207E-01-0.03666917E-04    3
- 0.04703992E-07-0.01836011E-10-0.01213151E+06 0.03193555E+02                   4
-HCL2SICH3          40992H   4C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01459366E+03 0.04006211E-01-0.04818700E-05-0.01336338E-08 0.02648821E-12    2
--0.05346984E+06-0.04689795E+03 0.04155299E+02 0.02995026E+00-0.02799546E-03    3
- 0.01433046E-06-0.03013208E-10-0.04973616E+06 0.09051815E+02                   4
-HCL2SISICL2H       40992H   2SI  2CL  4     G  0200.00   4000.00  1500.00      1
- 0.01863092E+03 0.01991871E-01-0.04703153E-05 0.02393378E-09 0.02997096E-13    2
--0.07983306E+06-0.05812192E+03 0.08215700E+02 0.03290751E+00-0.03764294E-03    3
- 0.02071053E-06-0.04369767E-10-0.07671145E+06-0.04245506E+02                   4
-HCLCCCLO           40992H   1C   2 O  1CL  2G  0200.00   4000.00  1500.00      1
- 0.01282877E+03 0.02295631E-01-0.04601887E-05-0.02941710E-09 0.01148412E-12    2
--0.01481358E+06-0.03708152E+03 0.03082763E+02 0.03013466E+00-0.03298082E-03    3
- 0.01776354E-06-0.03720337E-10-0.01177928E+06 0.01372635E+03                   4
-HCLCCHO            53090C   2H   2O   1CL  1G  0200.00   5000.00  1500.00      1
- 0.01228193E+03 0.02136310E-01-0.03756942E-05-0.01347374E-09 0.05834907E-13    2
--0.08447210E+05-0.03860056E+03 0.01544662E+02 0.02882431E+00-0.02921314E-03    3
- 0.01557811E-06-0.03358528E-10-0.04546644E+05 0.01905110E+03                   4
-HCLSI(CH3)2        40992H   7C   2SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01779932E+03 0.06864497E-01-0.06677913E-05-0.02916791E-08 0.05251096E-12    2
--0.04235416E+06-0.06627844E+03 0.03428693E+02 0.03880542E+00-0.03118298E-03    3
- 0.01483918E-06-0.03097758E-10-0.03676770E+06 0.01220014E+03                   4
-HCLSI(CH3)CH2      40992H   6C   2SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01684996E+03 0.05769153E-01-0.06362653E-05-0.02117805E-08 0.04004912E-12    2
--0.01692029E+06-0.05821970E+03 0.03518672E+02 0.03868692E+00-0.03578989E-03    3
- 0.01856940E-06-0.03976975E-10-0.01207708E+06 0.01340137E+03                   4
-HCLSICH2           40992H   3C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01094639E+03 0.03063482E-01-0.04057563E-05-0.07933510E-09 0.01649546E-12    2
--0.03161099E+05-0.03101113E+03 0.02331473E+02 0.02712338E+00-0.02843577E-03    3
- 0.01542443E-06-0.03288710E-10-0.03745104E+04 0.01417701E+03                   4
-HCLSICH3           40992H   4C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
- 0.01183446E+03 0.03802168E-01-0.04054360E-05-0.01478932E-08 0.02756845E-12    2
--0.09669808E+05-0.03413556E+03 0.03061496E+02 0.02418432E+00-0.02072566E-03    3
- 0.01016711E-06-0.02124115E-10-0.06367089E+05 0.01342892E+03                   4
-HCLSISI            40992H   1SI  2CL  1     G  0200.00   4000.00  1500.00      1
- 0.08766356E+02 0.08352699E-02-0.01828719E-05 0.04227080E-10 0.01924493E-13    2
- 0.03066829E+06-0.01515527E+03 0.05006777E+02 0.01170423E+00-0.01308663E-03    3
- 0.07173085E-07-0.01520111E-10 0.03183531E+06 0.04414009E+02                   4
-HCN               110193H   1C   1N   1     G  0200.00   4000.00  1000.00      1
- 0.03426457E+02 0.03924190E-01-0.01601138E-04 0.03161966E-08-0.02432850E-12    2
- 0.01485552E+06 0.03607795E+02 0.02417787E+02 0.09031856E-01-0.01107727E-03    3
- 0.07980141E-07-0.02311141E-10 0.01501044E+06 0.08222891E+02                   4
-HCNH               41687C   1H   2N   1     G  0200.00   4000.00  1000.00      1
- 0.04923293E+02 0.03332897E-01-0.03370897E-05-0.01901619E-08 0.03531825E-12    2
- 0.03132669E+06-0.01632509E+02 0.02759456E+02 0.06103387E-01 0.07713149E-05    3
--0.02063094E-07 0.01931920E-11 0.03217247E+06 0.01057489E+03                   4
-HCNO              120186H   1C   1N   1O   1G  0250.00   4000.00  1000.00      1
- 0.06692412E+02 0.02368360E-01-0.02371510E-05-0.01275503E-08 0.02407137E-12    2
- 0.01694737E+06-0.01245434E+03 0.03184859E+02 0.09752316E-01-0.01280203E-04    3
--0.06163104E-07 0.03226275E-10 0.01797907E+06 0.06123844E+02                   4
-HCO               121286H   1C   1O   1     G  0200.00   5000.00  1000.00      1
- 0.03557271E+02 0.03345573E-01-0.01335006E-04 0.02470573E-08-0.01713851E-12    2
- 0.03916324E+05 0.05552299E+02 0.02898330E+02 0.06199147E-01-0.09623084E-04    3
- 0.01089825E-06-0.04574885E-10 0.04159922E+05 0.08983614E+02                   4
-HCO+              121286H   1C   1O   1E  -1G  0200.00   5000.00  1000.00      1
- 0.03692074E+02 0.03454732E-01-0.01316524E-04 0.02323551E-08-0.01554132E-12    2
- 0.09890941E+06 0.02330722E+02 0.02496483E+02 0.08690658E-01-0.01060445E-03    3
- 0.07882791E-07-0.02418385E-10 0.09915097E+06 0.08048178E+02                   4
-HCOOH             103190C   1H   2O   2     G  0200.00   4000.00  1500.00      1
- 0.07959698E+02 0.03024532E-01-0.03434242E-05-0.01326767E-08 0.02520240E-12    2
--0.05027445E+06-0.01872208E+03 0.09326031E+01 0.01891002E+00-0.01554964E-03    3
- 0.07290031E-07-0.01483695E-10-0.04760071E+06 0.01950653E+03                   4
-HE                120186HE  1               G  0200.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.07453750E+04 0.09153489E+01 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.07453750E+04 0.09153488E+01                   4
-HE+               120186HE  1E  -1          G  0200.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.02853427E+07 0.01608405E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.02853427E+07 0.01608405E+02                   4
-HF                121286H   1F   1          G  0200.00   5000.00  1000.00      1
- 0.02956767E+02 0.07721015E-02-0.09899833E-06-0.04993521E-10 0.01429331E-13    2
--0.03361061E+06 0.04011673E+02 0.03431841E+02 0.04404166E-02-0.08828452E-05    3
- 0.06574516E-08-0.02055910E-12-0.03381977E+06 0.01238270E+02                   4
-HG2BR2(S)          81292BR  2HG  2          S  0200.00   1500.00  1000.00      1
- 0.01131527E+03 0.05176237E-01-0.09149018E-05-0.01774353E-07 0.08208311E-11    2
--0.02812664E+06-0.03960847E+03 0.09176256E+02 0.01716637E+00-0.02379101E-03    3
- 0.01656353E-06-0.04492058E-10-0.02787921E+06-0.03016915E+03                   4
-HG2CL2(S)          81292CL  2HG  2          S  0200.00   1500.00  1000.00      1
- 0.01170237E+03 0.03242224E-01-0.01018772E-05-0.03745899E-08 0.04682208E-12    2
--0.03555571E+06-0.04461773E+03 0.01002375E+03 0.01031694E+00-0.01160577E-03    3
- 0.08123549E-07-0.02343515E-10-0.03522627E+06-0.03658009E+03                   4
-HG2F2(S)           81292F   2HG  2          S  0200.00   1500.00  1000.00      1
- 0.01156086E+03 0.03513290E-01-0.04228193E-06-0.06265655E-08 0.01191005E-11    2
--0.06207291E+06-0.04780613E+03 0.01035013E+03 0.06139501E-01-0.03674693E-05    3
--0.03011902E-07 0.01414143E-10-0.06172955E+06-0.04143495E+03                   4
-HG2I2(S)           81292HG  2I   2          S  0200.00   1500.00  1000.00      1
- 0.01104021E+03 0.05724188E-01-0.09515335E-05-0.02149612E-07 0.09793057E-11    2
--0.01777374E+06-0.03535439E+03 0.09788829E+02 0.01440390E+00-0.01844748E-03    3
- 0.01180869E-06-0.02911372E-10-0.01774167E+06-0.03032197E+03                   4
-HGAET              62987GA  1C   2H   6     G  0200.00   1500.00  0600.00      1
- 0.06580152E+02 0.01610132E+00 0.05009546E-05-0.05185148E-07 0.01524085E-10    2
- 0.08765131E+05-0.04046067E+01 0.01163284E+02 0.03282213E+00 0.06765717E-04    3
--0.06509541E-06 0.04835807E-09 0.09767174E+05 0.02588269E+03                   4
-HGAET2             62987GA  1C   4H  11     G  0200.00   1500.00  0600.00      1
- 0.06511306E+02 0.02819754E+00 0.01418751E-04-0.09000947E-07 0.02572894E-10    2
--0.04482180E+05 0.04709022E+02-0.01486576E+02 0.05217640E+00 0.01356342E-03    3
--0.01011982E-05 0.07319854E-09-0.02985242E+05 0.04364749E+03                   4
-HGAME              62987GA  1C   1H   4     G  0200.00   1500.00  0600.00      1
- 0.05318279E+02 0.09490931E-01 0.02277164E-05-0.03005070E-07 0.09037830E-11    2
- 0.01253534E+06-0.01065710E+01 0.01784750E+02 0.02058861E+00 0.03548509E-04    3
--0.04111927E-06 0.03108978E-09 0.01318422E+06 0.01700702E+03                   4
-HGAME2             62987GA  1C   2H   7     G  0200.00   1500.00  0600.00      1
- 0.06759398E+02 0.01426103E+00-0.01174024E-05-0.05001401E-07 0.01502785E-10    2
--0.01473265E+05-0.02967135E+02 0.09039155E+01 0.03264779E+00 0.05389244E-04    3
--0.06814504E-06 0.05150323E-09-0.03978242E+04 0.02539305E+03                   4
-HGBR               81292BR  1HG  1          G  0200.00   5000.00  1000.00      1
- 0.04470182E+02 0.01740022E-02-0.01782286E-06 0.03639776E-10-0.02699461E-14    2
- 0.01118634E+06 0.07116504E+02 0.04325519E+02 0.06429246E-02-0.04527797E-05    3
- 0.04543436E-09 0.06863204E-12 0.01121730E+06 0.07833202E+02                   4
-HGCL2              81292CL  2HG  1          G  0200.00   5000.00  1000.00      1
- 0.07251462E+02 0.03082143E-02-0.01447555E-05 0.02958294E-09-0.02201214E-13    2
--0.01981231E+06-0.06061846E+02 0.06249130E+02 0.03221573E-01-0.02109668E-04    3
--0.07713536E-08 0.08526178E-11-0.01958242E+06-0.01015613E+02                   4
-HGCL2(S)           81292CL  2HG  1          S  0200.00   1500.00  1000.00      1
- 0.07750329E+02 0.03529253E-01 0.03886646E-06-0.08307839E-08 0.02781535E-11    2
--0.03009787E+06-0.02772331E+03 0.07611778E+02 0.05084911E-01-0.02887606E-04    3
- 0.09093899E-08 0.04734468E-12-0.03015054E+06-0.02738100E+03                   4
-HGF2               81292F   2HG  1          G  0200.00   5000.00  1000.00      1
- 0.06970407E+02 0.06373497E-02-0.02938029E-05 0.05925826E-09-0.04366956E-13    2
--0.03751535E+06-0.08137829E+02 0.05155538E+02 0.05733727E-01-0.03667157E-04    3
--0.01223692E-07 0.01370429E-10-0.03707844E+06 0.01073098E+02                   4
-HGF2(S)            81292F   2HG  1          S  0200.00   2000.00  1000.00      1
- 0.08322627E+02 0.02317361E-01 0.02103511E-05-0.09665973E-09 0.01631405E-12    2
--0.05342179E+06-0.03414006E+03 0.08250103E+02 0.02543387E-01-0.07218619E-06    3
- 0.08044224E-09-0.03175138E-12-0.05340276E+06-0.03377085E+03                   4
-HGH                81292H   1HG  1          G  0200.00   5000.00  1000.00      1
- 0.03674353E+02 0.01116618E-01-0.03728888E-05 0.07077644E-09-0.04984356E-13    2
- 0.02745200E+06 0.04954799E+02 0.02859969E+02 0.03217363E-01-0.02993410E-04    3
- 0.02267118E-07-0.08671660E-11 0.02771287E+06 0.09273314E+02                   4
-HGI                81292HG  1I   1          G  0200.00   5000.00  1000.00      1
- 0.04487935E+02 0.03041356E-02-0.07219846E-07 0.01468881E-10-0.01089820E-14    2
- 0.01470042E+06 0.08086309E+02 0.04411734E+02 0.05799910E-02-0.03475217E-05    3
- 0.01593090E-08-0.01730073E-12 0.01471610E+06 0.08458668E+02                   4
-HGO                81292HG  1O   1          G  0200.00   5000.00  1000.00      1
- 0.04192036E+02 0.04176084E-02-0.01658976E-05 0.03318185E-09-0.02429647E-13    2
- 0.03713110E+05 0.04621457E+02 0.03235991E+02 0.03067171E-01-0.01992628E-04    3
--0.04378690E-08 0.06018341E-11 0.03950193E+05 0.09495331E+02                   4
-HGO(S)             81292HG  1O   1          S  0200.00   1000.00  1000.00      1
- 0.07146808E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01350616E+06-0.03327734E+03 0.02854835E+02 0.01115052E+00-0.01160794E-03    3
- 0.06126729E-07-0.01377341E-10-0.01217635E+06-0.01067390E+03                   4
-HMEGAET            62987GA  1C   3H   9     G  0200.00   1500.00  0600.00      1
- 0.07025463E+02 0.02564787E+00 0.09619100E-05-0.08403699E-07 0.02488960E-10    2
--0.01361377E+05-0.03319484E+02-0.02079143E+02 0.05373076E+00 0.01181036E-03    3
--0.01099855E-05 0.08189554E-09 0.03216961E+04 0.04086070E+03                   4
-HN(OH)2           103190H   3N   1O   2     G  0200.00   4000.00  1500.00      1
- 0.09963640E+02 0.02864737E-01-0.03812930E-05-0.07443356E-09 0.01610124E-12    2
--0.01662184E+06-0.02871770E+03 0.03244199E+01 0.02850544E+00-0.02753934E-03    3
- 0.01337294E-06-0.02571777E-10-0.01354499E+06 0.02201480E+03                   4
-HN3                82687H   1N   3          G  0200.00   4000.00  1000.00      1
- 0.06023015E+02 0.02454362E-01-0.02404279E-05-0.01322973E-08 0.02474146E-12    2
- 0.03394051E+06-0.07015537E+02 0.03621003E+02 0.06030785E-01 0.04054460E-05    3
--0.02545271E-07 0.06174280E-11 0.03482373E+06 0.06333769E+02                   4
-HNC                92392H   1C   1N   1     G  0200.00   5000.00  1500.00      1
- 0.05283464E+02 0.01092476E-01-0.01170865E-05-0.02308672E-09 0.03950673E-13    2
- 0.02012958E+06-0.06388218E+02 0.03592377E+02 0.05561340E-01-0.05936823E-04    3
- 0.03782329E-07-0.09365092E-11 0.02079803E+06 0.02732160E+02                   4
-HNCN               62790C   1H   1N   2     G  0200.00   4000.00  1500.00      1
- 0.07251951E+02 0.01587363E-01-0.01995579E-05-0.04841944E-09 0.09908280E-13    2
- 0.03563666E+06-0.01312080E+03 0.02951908E+02 0.01245028E+00-0.01161611E-03    3
- 0.05786108E-07-0.01175004E-10 0.03712483E+06 0.09811426E+02                   4
-HNCNH              62790C   1H   2N   2     G  0200.00   4000.00  1500.00      1
- 0.08374143E+02 0.02366143E-01-0.03502324E-05-0.04391102E-09 0.01096859E-12    2
- 0.01461088E+06-0.02107393E+03 0.01001985E+02 0.02464016E+00-0.02759770E-03    3
- 0.01532472E-06-0.03268280E-10 0.01679368E+06 0.01694325E+03                   4
-HNCO              110193H   1C   1N   1O   1G  0200.00   4000.00  1400.00      1
- 0.06545307E+02 0.01965760E-01-0.01562664E-05-0.01074318E-08 0.01874680E-12    2
--0.01664773E+06-0.01003880E+03 0.03858467E+02 0.06390342E-01-0.09016628E-05    3
--0.01898224E-07 0.07651380E-11-0.01562343E+06 0.04882493E+02                   4
-HNF                42489H   1N   1F   1     G  0200.00   3000.00  1000.00      1
- 0.04133219E+02 0.01912057E-01-0.01625330E-05-0.01726461E-08 0.03743691E-12    2
- 0.01467052E+06 0.03292122E+02 0.03249761E+02 0.03261818E-01 0.04355642E-06    3
--0.01100277E-07 0.02926757E-11 0.01499126E+06 0.08187434E+02                   4
-HNF2               42489H   1N   1F   2     G  0200.00   3000.00  1000.00      1
- 0.05704866E+02 0.03049897E-01-0.02826803E-05-0.02923185E-08 0.06551055E-12    2
--0.09107488E+05-0.03941332E+02 0.02572812E+02 0.08762144E-01-0.02326921E-05    3
--0.05000826E-07 0.02143838E-10-0.08086760E+05 0.01300681E+03                   4
-HNNHO             103190H   2N   2O   1     G  0200.00   4000.00  1500.00      1
- 0.07462348E+02 0.03113521E-01-0.02614534E-05-0.01394601E-08 0.02363352E-12    2
- 0.07517607E+05-0.01619293E+03 0.07974964E+01 0.01693171E+00-0.01141086E-03    3
- 0.04201242E-07-0.06926417E-11 0.01010665E+06 0.02038765E+03                   4
-HNNO              103190H   1N   2O   1     G  0200.00   4000.00  1500.00      1
- 0.06991217E+02 0.01875970E-01-0.02124584E-05-0.06710472E-09 0.01230508E-12    2
- 0.02497566E+06-0.01123523E+03 0.02238298E+02 0.01359200E+00-0.01179873E-03    3
- 0.05392971E-07-0.01010859E-10 0.02660259E+06 0.01413679E+03                   4
-HNNONO             10891H   1N   3O   2     G  0200.00   4000.00  1500.00      1
- 0.01246747E+03 0.02018438E-01-0.03674474E-05-0.03459117E-09 0.01090810E-12    2
- 0.02452278E+06-0.03868309E+03 0.02642670E+02 0.02625418E+00-0.02477878E-03    3
- 0.01184374E-06-0.02298757E-10 0.02793182E+06 0.01383705E+03                   4
-HNO               121286H   1N   1O   1     G  0200.00   5000.00  1000.00      1
- 0.03615144E+02 0.03212486E-01-0.01260337E-04 0.02267298E-08-0.01536236E-12    2
- 0.01066191E+06 0.04810264E+02 0.02784403E+02 0.06609646E-01-0.09300223E-04    3
- 0.09437980E-07-0.03753146E-10 0.01091878E+06 0.09035629E+02                   4
-HNO2              103190H   1N   1O   2     G  0200.00   4000.00  1500.00      1
- 0.06479630E+02 0.01995274E-01-0.01740387E-05-0.09695872E-09 0.01701480E-12    2
--0.09999271E+05-0.01067286E+03 0.01934838E+02 0.01010036E+00-0.04964616E-04    3
- 0.08701120E-08-0.02324135E-13-0.08105484E+05 0.01473250E+03                   4
-HNO3              121286H   1N   1O   3     G  0200.00   5000.00  1000.00      1
- 0.07003845E+02 0.05811493E-01-0.02333789E-04 0.04288814E-08-0.02959385E-12    2
--0.01889952E+06-0.01047863E+03 0.01353185E+02 0.02220025E+00-0.01978812E-03    3
- 0.08773908E-07-0.01658384E-10-0.01738563E+06 0.01851868E+03                   4
-HNOH              102290H   2N   1O   1     G  0200.00   4000.00  1500.00      1
- 0.06396134E+02 0.01821067E-01-0.01870892E-05-0.07844472E-09 0.01444855E-12    2
- 0.07859615E+05-0.01040479E+03 0.02125274E+02 0.01066282E+00-0.07602589E-04    3
- 0.03081642E-07-0.05726498E-11 0.09553544E+05 0.01309672E+03                   4
-HO2                20387H   1O   2          G  0200.00   5000.00  1000.00      1
- 0.04072191E+02 0.02131296E-01-0.05308145E-05 0.06112269E-09-0.02841165E-13    2
--0.01579727E+04 0.03476029E+02 0.02979963E+02 0.04996697E-01-0.03790997E-04    3
- 0.02354192E-07-0.08089024E-11 0.01762274E+04 0.09222724E+02                   4
-HOCH2OH           103190C   1H   4O   2     G  0200.00   4000.00  1500.00      1
- 0.01089048E+03 0.04000443E-01-0.04729597E-05-0.01295970E-08 0.02552658E-12    2
--0.05347440E+06-0.03540623E+03-0.06548874E+01 0.03377715E+00-0.03157595E-03    3
- 0.01532216E-06-0.02994259E-10-0.04963411E+06 0.02579207E+03                   4
-HOCL               40992H   1 O  1CL  1     G  0200.00   4000.00  1500.00      1
- 0.04953150E+02 0.01100053E-01-0.01256296E-05-0.03349951E-09 0.06464506E-13    2
--0.01114737E+06-0.06838384E+01 0.02861399E+02 0.07134484E-01-0.07311028E-04    3
- 0.03980236E-07-0.08506421E-11-0.01049306E+06 0.01021485E+03                   4
-HOCN              110193H   1C   1N   1O   1G  0200.00   4000.00  1400.00      1
- 0.06022112E+02 0.01929530E-01-0.01455029E-05-0.01045811E-08 0.01794814E-12    2
--0.04040321E+05-0.05866433E+02 0.03789424E+02 0.05387981E-01-0.06518270E-05    3
--0.01420164E-07 0.05367969E-11-0.03135335E+05 0.06667052E+02                   4
-HOCO              103190C   1H   1O   2     G  0200.00   4000.00  1500.00      1
- 0.07517634E+02 0.01259029E-01-0.01910901E-05-0.03136391E-09 0.07547673E-13    2
--0.02634121E+06-0.01448392E+03 0.02285122E+02 0.01351435E+00-0.01160407E-03    3
- 0.05047011E-07-0.09032231E-11-0.02448416E+06 0.01367874E+03                   4
-HONO               31787H   1N   1O   2     G  0200.00   5000.00  1000.00      1
- 0.05486893E+02 0.04218065E-01-0.01649143E-04 0.02971877E-08-0.02021148E-12    2
--0.01126865E+06-0.02997002E+02 0.02290413E+02 0.01409922E+00-0.01367872E-03    3
- 0.07498780E-07-0.01876905E-10-0.01043195E+06 0.01328077E+03                   4
-HONO2             103190H   1N   1O   3     G  0200.00   4000.00  1500.00      1
- 0.09756148E+02 0.01900948E-01-0.03240020E-05-0.03976639E-09 0.01100334E-12    2
--0.01942244E+06-0.02690023E+03 0.07877668E+01 0.02382329E+00-0.02205964E-03    3
- 0.01034048E-06-0.01972857E-10-0.01630442E+06 0.02108964E+03                   4
-HSI(CH3)2          61991H   7C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.01220942E+03 0.09173338E-01-0.01186653E-05-0.01188590E-07 0.02418110E-11    2
- 0.03781464E+05-0.03668250E+03 0.02568267E+02 0.03071446E+00-0.01863911E-03    3
- 0.06210373E-07-0.09376544E-11 0.07271919E+05 0.01551808E+03                   4
-HSI(CH3)2CH2       61991H   9C   3SI  1     G  0200.00   2500.00  1500.00      1
- 0.01723999E+03 0.01101475E+00-0.01546410E-05-0.01338650E-07 0.02653453E-11    2
--0.02842083E+05-0.06077749E+03 0.03367732E+02 0.04430759E+00-0.03246598E-03    3
- 0.01379387E-06-0.02586752E-10 0.02041653E+05 0.01367000E+03                   4
-HSI(CH3)3          61991H  10C   3SI  1     G  0200.00   2500.00  1500.00      1
- 0.01689903E+03 0.01338224E+00-0.01538243E-05-0.01746233E-07 0.03550375E-11    2
--0.02740327E+06-0.06121112E+03 0.03224459E+02 0.04373614E+00-0.02597404E-03    3
- 0.08415742E-07-0.01236561E-10-0.02243583E+06 0.01289306E+03                   4
-HSI(NH2)2          22790SI  1H   5N   2     G  0200.00   4000.00  1000.00      1
- 0.01171677E+03 0.05339021E-01-0.04667824E-05-0.02824087E-08 0.05080916E-12    2
--0.01264169E+05-0.03245118E+03 0.06289699E+02 0.01675060E+00-0.01520878E-04    3
--0.01070065E-06 0.05538641E-10 0.03154771E+04-0.03746008E+02                   4
-HSI(NH2)3          22790SI  1H   7N   3     G  0200.00   4000.00  1000.00      1
- 0.01661406E+03 0.07395874E-01-0.06440010E-05-0.03918887E-08 0.07045959E-12    2
--0.03859547E+06-0.05865318E+03 0.07070983E+02 0.02754435E+00-0.02603669E-04    3
--0.01874567E-06 0.09778511E-10-0.03582658E+06-0.08209675E+02                   4
-HSIC               61991H   1C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.05849544E+02 0.07628346E-02-0.09974130E-06-0.03811586E-09 0.08581471E-13    2
- 0.09097438E+06-0.04862062E+02 0.03761288E+02 0.06108070E-01-0.05721172E-04    3
- 0.02805116E-07-0.05597709E-11 0.09168219E+06 0.06236756E+02                   4
-HSICCH             61991H   2C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.09098096E+02 0.02292999E-01-0.01278589E-05-0.01869017E-08 0.03514532E-12    2
- 0.04933532E+06-0.02153271E+03 0.03799881E+02 0.01633703E+00-0.01551299E-03    3
- 0.07880591E-07-0.01619982E-10 0.05109468E+06 0.06475363E+02                   4
-HSICH2             61991H   3C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.08641686E+02 0.02535259E-01-0.01532829E-05-0.02418416E-08 0.04870000E-12    2
- 0.03962671E+06-0.02128790E+03 0.02376883E+02 0.01822864E+00-0.01641260E-03    3
- 0.07937691E-07-0.01590356E-10 0.04179768E+06 0.01215211E+03                   4
-HSICH3             61991H   4C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.07578257E+02 0.05000398E-01-0.08706991E-06-0.06516750E-08 0.01344446E-11    2
- 0.02138075E+06-0.01438961E+03 0.02658293E+02 0.01547950E+00-0.08319889E-04    3
- 0.02184355E-07-0.02302844E-11 0.02319822E+06 0.01240552E+03                   4
-HSICL             121986SI  1H   1CL  1     G  0200.00   2000.00  1000.00      1
- 0.04900628E+02 0.01981752E-01-0.03634647E-05-0.02285211E-08 0.07633527E-12    2
- 0.06914634E+05 0.01377004E+02 0.03072748E+02 0.09057843E-01-0.01159134E-03    3
- 0.08310477E-07-0.02483000E-10 0.07324210E+05 0.01033490E+03                   4
-HSIN               22790H   1SI  1N   1     G  0200.00   4000.00  1000.00      1
- 0.05746590E+02 0.01167119E-01-0.01360742E-05-0.05908617E-09 0.01174696E-12    2
- 0.04484671E+06-0.05931788E+02 0.04865176E+02 0.01775119E-01 0.04890870E-05    3
- 0.03922383E-08-0.07913276E-11 0.04526353E+06-0.07134509E+01                   4
-HSINH              42489SI  1H   2N   1     G  0200.00   3000.00  1000.00      1
- 0.06493435E+02 0.02567980E-01-0.03126526E-05-0.02577467E-08 0.06216479E-12    2
- 0.04035934E+06-0.07830112E+02 0.03566343E+02 0.08446736E-01-0.07699952E-05    3
--0.05270970E-07 0.02581065E-10 0.04124904E+06 0.07780791E+02                   4
-HSINH2             42489SI  1N   1H   3     G  0200.00   3000.00  1000.00      1
- 0.06177894E+02 0.04689964E-01-0.03583294E-05-0.04457980E-08 0.09379187E-12    2
- 0.01091277E+06-0.07006672E+02 0.02716144E+02 0.01204278E+00-0.09827195E-05    3
--0.07408477E-07 0.03789792E-10 0.01190771E+06 0.01126252E+03                   4
-HSISICL            40992H   1SI  2CL  1     G  0200.00   4000.00  1500.00      1
- 0.09242357E+02 0.07265211E-02-0.02039730E-05-0.03559737E-10 0.04236577E-13    2
- 0.03651789E+06-0.01714597E+03 0.05753464E+02 0.01000321E+00-0.01097056E-03    3
- 0.06117942E-07-0.01351102E-10 0.03773825E+06 0.01395110E+02                   4
-I*C3H7            120186C   3H   7          G  0200.00   5000.00  1000.00      1
- 0.08063369E+02 0.01574488E+00-0.05182392E-04 0.07477245E-08-0.03854422E-12    2
- 0.05313871E+05-0.02192647E+03 0.01713300E+02 0.02542616E+00 0.01580808E-04    3
--0.01821286E-06 0.08827710E-10 0.07535809E+05 0.01297901E+03                   4
-K                  81092K   1               G  0200.00   5000.00  1000.00      1
- 0.02563720E+02-0.01453656E-02 0.01223794E-05-0.05337797E-09 0.01196251E-12    2
- 0.09958933E+05 0.04689090E+02 0.02599395E+02-0.06665192E-02 0.01537419E-04    3
--0.01462701E-07 0.04917226E-11 0.09968534E+05 0.04606125E+02                   4
-K(L)               81092K   1               L  0200.00   2000.00  1000.00      1
- 0.03274152E+02-0.08858241E-03 0.03862458E-05 0.01524701E-08-0.07158116E-12    2
--0.05365253E+04-0.09686786E+02 0.04883188E+02-0.05109876E-01 0.08368289E-04    3
--0.07183867E-07 0.02694974E-10-0.01014822E+05-0.01801753E+03                   4
-K+                 81092K   1E  -1          G  0200.00   5000.00  1000.00      1
- 0.02500252E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.06110476E+06 0.04335097E+02 0.02500252E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.06110476E+06 0.04335097E+02                   4
-K2                 81092K   2               G  0200.00   5000.00  1000.00      1
- 0.04493744E+02 0.02561175E-02-0.03738461E-07 0.07392168E-11-0.05314252E-15    2
- 0.01393386E+06 0.04344696E+02 0.04445378E+02 0.04507960E-02-0.02923572E-05    3
- 0.01874060E-08-0.04441270E-12 0.01394330E+06 0.04577300E+02                   4
-K2B4O7(S)          81292B   4K   2O   7     S  0200.00   2000.00  1000.00      1
- 0.02241821E+03 0.01632758E+00-0.03423961E-04-0.01996427E-07 0.07329643E-11    2
--0.04092750E+07-0.01095459E+04-0.02998519E+02 0.01131803E+01-0.01363625E-02    3
- 0.07498933E-06-0.01475027E-09-0.04041216E+07 0.01385206E+03                   4
-K2B6O10(S)         81292B   6K   2O  10     S  0200.00   2000.00  1000.00      1
- 0.03118760E+03 0.02605101E+00-0.07109914E-04-0.01524101E-07 0.08605891E-11    2
--0.05702715E+07-0.01601394E+04 0.08964822E+02 0.01355307E+01-0.02844741E-02    3
- 0.03136564E-05-0.01242126E-08-0.05641143E+07-0.05121922E+03                   4
-K2B8O13(S)         81292B   8K   2O  13     S  0200.00   2000.00  1000.00      1
- 0.04112535E+03 0.02714051E+00 0.01343626E-04-0.04965544E-07 0.09664300E-11    2
--0.07315279E+07-0.02135898E+04 0.02800687E+03 0.02363518E+00 0.05436592E-03    3
--0.04802017E-06 0.07622581E-10-0.07248984E+07-0.01332889E+04                   4
-K2CO3(S)           81292C   1K   2O   3     S  0200.00   2000.00  1000.00      1
- 0.01170935E+03 0.01041619E+00 0.01020812E-04-0.05155670E-08 0.09388472E-12    2
--0.01424670E+07-0.05154899E+03 0.06680495E+02 0.03154875E+00-0.03258348E-03    3
- 0.02341080E-06-0.06331882E-10-0.01414994E+07-0.02751031E+03                   4
-K2H2O2             81292H   2K   2O   2     G  0200.00   5000.00  1000.00      1
- 0.09476007E+02 0.05520012E-01-0.02003512E-04 0.03416984E-08-0.02230089E-12    2
--0.08204786E+06-0.01665546E+03 0.06069657E+02 0.01657159E+00-0.01641134E-03    3
- 0.09628012E-07-0.02546013E-10-0.08118152E+06 0.05625929E+01                   4
-K2O(S)             81092K   2O   1          S  0200.00   2000.00  1000.00      1
- 0.09200109E+02 0.04813529E-01-0.01018656E-04 0.08972973E-08-0.02121417E-11    2
--0.04671154E+06-0.04264142E+03 0.02640315E+02 0.04577225E+00-0.09349357E-03    3
- 0.08921012E-06-0.03044898E-09-0.04583697E+06-0.01392763E+03                   4
-K2O2(S)            81092K   2O   2          S  0200.00   2000.00  1000.00      1
- 0.01094138E+03 0.06102309E-01 0.08639951E-05-0.02383978E-08 0.01021959E-12    2
--0.06335114E+06-0.05099447E+03 0.08940024E+02 0.01225014E+00-0.08065365E-04    3
- 0.07182271E-07-0.02627561E-10-0.06277485E+06-0.04066683E+03                   4
-K2SO4              81092K   2O   4S   1     G  0200.00   5000.00  1000.00      1
- 0.01526056E+03 0.04272701E-01-0.01902870E-04 0.03745009E-08-0.02710228E-12    2
--0.01368994E+07-0.04548655E+03 0.06620770E+02 0.02753542E+00-0.01909671E-03    3
--0.04668391E-08 0.03385142E-10-0.01346318E+07-0.01043411E+02                   4
-K2SO4(A)           81092K   2O   4S   1     S  0200.00   1200.00  1000.00      1
- 0.01112054E+03 0.01688473E+00 0.02694884E-04-0.06810694E-07 0.03326950E-10    2
--0.01771853E+07-0.04766545E+03 0.05610137E+02 0.05334319E+00-0.08680538E-03    3
- 0.08485600E-06-0.02978756E-09-0.01763645E+07-0.02358624E+03                   4
-K2SO4(B)           81092K   2O   4S   1     S  0200.00   1500.00  1000.00      1
- 0.01400625E+03 0.08639256E-01 0.01734839E-04-0.01101018E-07 0.02493181E-11    2
--0.01758863E+07-0.05931899E+03 0.01384030E+03 0.09154258E-01 0.01580722E-04    3
--0.01673984E-07 0.06273504E-11-0.01758589E+07-0.05851410E+03                   4
-K3CL6AL(S)         81292AL  1CL  6K   3     S  0200.00   2000.00  1000.00      1
- 0.02692199E+03 0.01202448E+00 0.05058586E-06-0.02459252E-07 0.06112274E-11    2
--0.02602720E+07-0.01118533E+04 0.02756025E+03 0.01980910E-01 0.02914285E-03    3
--0.03306608E-06 0.01153111E-09-0.02601182E+07-0.01132925E+04                   4
-K3CL9AL2(S)        81292AL  2CL  9K   3     S  0200.00   1500.00  1000.00      1
- 0.04789960E+03-0.03698524E-01 0.01208277E-04 0.06439299E-07-0.01714364E-10    2
--0.03594776E+07-0.02186357E+04 0.03685728E+03 0.02754220E-01 0.05087779E-03    3
--0.06808868E-06 0.02773367E-09-0.03554758E+07-0.01561649E+04                   4
-K3F6AL(S)          81292AL  1F   6K   3     S  0200.00   2000.00  1000.00      1
- 0.02557611E+03 0.01452585E+00-0.02005301E-04-0.01843642E-07 0.05259736E-11    2
--0.04090259E+07-0.01172057E+04 0.01633462E+03 0.05150368E+00-0.07128115E-03    3
- 0.06274052E-06-0.02251868E-09-0.04067185E+07-0.07147460E+03                   4
-KBF4               81292B   1F   4K   1     G  0200.00   5000.00  1000.00      1
- 0.01230182E+03 0.04142506E-01-0.01820830E-04 0.03550730E-08-0.02552394E-12    2
--0.01910389E+07-0.03449073E+03 0.05358002E+02 0.02295803E+00-0.01721231E-03    3
- 0.02466718E-07 0.01382599E-10-0.01891819E+07 0.01299769E+02                   4
-KBO2               81292B   1K   1O   2     G  0200.00   5000.00  1000.00      1
- 0.07506115E+02 0.02663024E-01-0.01134505E-04 0.02165299E-08-0.01532624E-12    2
--0.08364206E+06-0.08262075E+02 0.04636629E+02 0.01088843E+00-0.09865937E-04    3
- 0.04481115E-07-0.09043993E-11-0.08286314E+06 0.06500684E+02                   4
-KBO2(S)            81292B   1K   1O   2     S  0200.00   2000.00  1000.00      1
- 0.07971486E+02 0.06730890E-01-0.01544574E-04-0.09972352E-08 0.04052630E-11    2
--0.01227148E+07-0.03858371E+03 0.01603821E+02 0.03275175E+00-0.04757948E-03    3
- 0.03848067E-06-0.01269093E-09-0.01212629E+07-0.07486101E+02                   4
-KBR                81292BR  1K   1          G  0200.00   5000.00  1000.00      1
- 0.04458711E+02 0.01473836E-02-0.02499466E-06 0.05161851E-10-0.03875234E-14    2
--0.02300303E+06 0.04657488E+02 0.04270624E+02 0.07398923E-02-0.05320569E-05    3
--0.05894879E-10 0.01133094E-11-0.02296215E+06 0.05593031E+02                   4
-KBR(L)             81292BR  1K   1          L  0200.00   2500.00  1000.00      1
- 0.08404630E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.04779214E+06-0.03519115E+03 0.08404630E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.04779214E+06-0.03519115E+03                   4
-KBR(S)             81292BR  1K   1          S  0200.00   1500.00  1000.00      1
--0.05170830E+02 0.01746852E+00 0.01013392E-04-0.07494241E-07 0.02378879E-10    2
--0.04495981E+06 0.03946532E+03 0.05431605E+02 0.03845234E-01-0.03455247E-04    3
--0.09685064E-09 0.02470977E-10-0.04912882E+06-0.02040493E+03                   4
-KCL                81092CL  1K   1          G  0200.00   5000.00  1000.00      1
- 0.04434967E+02 0.01726721E-02-0.03865868E-06 0.07943251E-10-0.05932801E-14    2
--0.02716306E+06 0.03398542E+02 0.04149517E+02 0.01039142E-01-0.07034589E-05    3
--0.01200715E-08 0.02112008E-11-0.02709960E+06 0.04826011E+02                   4
-KCL(L)             81092CL  1K   1          L  0200.00   2000.00  1000.00      1
- 0.08852542E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.05337392E+06-0.04001344E+03 0.08852542E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.05337392E+06-0.04001344E+03                   4
-KCL(S)             81092CL  1K   1          S  0200.00   1500.00  1000.00      1
- 0.01391136E+01 0.07749002E-01 0.02100056E-04-0.01960861E-07 0.03813962E-12    2
--0.05188544E+06 0.09020889E+02 0.05818812E+02-0.05778791E-02 0.09593293E-04    3
--0.01468548E-06 0.07916702E-10-0.05429399E+06-0.02336092E+03                   4
-KCL4AL(S)          81292AL  1CL  4K   1     S  0200.00   2000.00  1000.00      1
- 0.02311946E+03 0.01525936E-01-0.06380630E-06-0.04176163E-08 0.01306884E-11    2
--0.01521618E+07-0.01113391E+04 0.01753111E+03-0.03647218E-01 0.03673018E-03    3
--0.03613268E-06 0.09813280E-10-0.01492592E+07-0.07647553E+03                   4
-KCLO4(S)           81092CL  1K   1O   4     S  0200.00   1500.00  1000.00      1
- 0.01704025E+03 0.06660737E-01-0.06016704E-05 0.09785776E-08-0.05059647E-11    2
--0.05676480E+06-0.08085843E+03-0.08468085E+02 0.01228758E+01-0.02129487E-02    3
- 0.01790606E-05-0.05694776E-09-0.05181381E+06 0.04005509E+03                   4
-KCN                81092C   1K   1N   1     G  0200.00   5000.00  1000.00      1
- 0.05842749E+02 0.01653475E-01-0.06722096E-05 0.01241081E-08-0.08573718E-13    2
- 0.07711161E+05-0.03406482E+02 0.05315387E+02 0.03936776E-01-0.05387426E-04    3
- 0.04814072E-07-0.01739264E-10 0.07842257E+05-0.08199391E+01                   4
-KCN(L)             81092C   1K   1N   1     L  0200.00   3000.00  1000.00      1
- 0.09058883E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01522798E+06-0.03545687E+03 0.09058883E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.01522798E+06-0.03545687E+03                   4
-KCN(S)             81092C   1K   1N   1     S  0200.00   2000.00  1000.00      1
- 0.07894013E+02 0.02150449E-02-0.01621315E-05 0.06831993E-09-0.01060712E-12    2
--0.01600422E+06-0.02964975E+03 0.08115453E+02-0.08847082E-02 0.01981085E-04    3
--0.01804607E-07 0.05974163E-11-0.01604356E+06-0.03067895E+03                   4
-KF                 81292F   1K   1          G  0200.00   5000.00  1000.00      1
- 0.04357120E+02 0.02586241E-02-0.08236973E-06 0.01676907E-09-0.01243132E-13    2
--0.04063861E+06 0.02285054E+02 0.03798984E+02 0.01885430E-01-0.01210870E-04    3
--0.03741075E-08 0.04494632E-11-0.04051013E+06 0.05095577E+02                   4
-KF(L)              81292F   1K   1          L  0200.00   3000.00  1000.00      1
- 0.08656265E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.06927377E+06-0.04118344E+03 0.08656265E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.06927377E+06-0.04118343E+03                   4
-KF(S)              81292F   1K   1          S  0200.00   2000.00  1000.00      1
- 0.03272299E+01 0.08993195E-01-0.03094381E-06-0.02624963E-07 0.07101532E-11    2
--0.06804909E+06 0.05309298E+02 0.06190467E+02-0.05622034E-01 0.02294401E-03    3
--0.02818213E-06 0.01204436E-09-0.07014057E+06-0.02637925E+03                   4
-KH                 81092H   1K   1          G  0200.00   5000.00  1000.00      1
- 0.03968138E+02 0.07086924E-02-0.02618517E-05 0.05096044E-09-0.03655452E-13    2
- 0.01350120E+06 0.08027413E+01 0.02900121E+02 0.03518317E-01-0.02544774E-04    3
- 0.04599961E-08 0.01286229E-11 0.01379667E+06 0.06342766E+02                   4
-KH(S)              81092H   1K   1          S  0200.00   1500.00  1000.00      1
- 0.05864564E+02 0.01204909E-01 0.02825877E-06 0.03559937E-08-0.02515747E-11    2
--0.09079129E+05-0.02848776E+03 0.05248775E+01 0.02016870E+00-0.02768125E-03    3
- 0.02024240E-06-0.06052568E-10-0.07796234E+05-0.01890097E+02                   4
-KI                 81092I   1K   1          G  0200.00   5000.00  1000.00      1
- 0.04470767E+02 0.01359027E-02-0.01768799E-06 0.03648327E-10-0.02733674E-14    2
--0.01644198E+06 0.05528315E+02 0.04327901E+02 0.05945793E-02-0.04409470E-05    3
- 0.04559572E-09 0.06522621E-12-0.01641095E+06 0.06237795E+02                   4
-KI(L)              81092I   1K   1          L  0200.00   2500.00  1000.00      1
- 0.08706593E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.04022598E+06-0.03588112E+03 0.08706593E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.04022598E+06-0.03588112E+03                   4
-KI(S)              81092I   1K   1          S  0200.00   2000.00  1000.00      1
- 0.01442913E+02 0.09802845E-01-0.01380615E-04-0.02325573E-07 0.07600708E-11    2
--0.03988335E+06 0.02717618E+02 0.05114120E+02 0.08508960E-01-0.02212545E-03    3
- 0.02836093E-06-0.01155892E-09-0.04120049E+06-0.01812497E+03                   4
-KO                 81092K   1O   1          G  0200.00   5000.00  1000.00      1
- 0.04400291E+02 0.02386787E-02-0.05880047E-06 0.01206713E-09-0.09006961E-14    2
- 0.07217110E+05 0.03434775E+02 0.03985333E+02 0.01469353E-01-0.09479054E-05    3
--0.02419141E-08 0.03264700E-11 0.07311120E+05 0.05517902E+02                   4
-KO-                81092K   1O   1E   1     G  0200.00   5000.00  1000.00      1
- 0.04394805E+02 0.02418371E-02-0.06146423E-06 0.01255348E-09-0.09326869E-14    2
--0.01794565E+06 0.02053687E+02 0.03961007E+02 0.01526099E-01-0.09806386E-05    3
--0.02666917E-08 0.03470232E-11-0.01784737E+06 0.04231682E+02                   4
-KO2(S)             81092K   1O   2          S  0200.00   1500.00  1000.00      1
- 0.01049310E+03 0.01397618E-01-0.06976643E-05 0.03477427E-08-0.01222708E-11    2
--0.03767516E+06-0.04607321E+03 0.04023244E+02 0.02903561E+00-0.04812416E-03    3
- 0.03816613E-06-0.01168231E-09-0.03635805E+06-0.01502191E+03                   4
-KOH                81092H   1K   1O   1     G  0200.00   2000.00  1000.00      1
- 0.09996477E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.05262511E+06-0.04533806E+03 0.09996477E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.05262511E+06-0.04533805E+03                   4
-KOH+               81092H   1K   1O   1E  -1G  0200.00   5000.00  1000.00      1
- 0.05583889E+02 0.01372118E-01-0.04239710E-05 0.06231942E-09-0.03548772E-13    2
- 0.05821436E+06-0.02017959E+02 0.05036081E+02 0.04278173E-01-0.04213406E-04    3
- 0.01114253E-07 0.03757057E-11 0.05823345E+06 0.03093667E+01                   4
-ME2GAET            62987GA  1C   4H  11     G  0200.00   1500.00  0600.00      1
- 0.07174541E+02 0.03235532E+00 0.01495199E-04-0.01048226E-06 0.03053962E-10    2
--0.06383914E+05-0.02026765E+02-0.03218207E+02 0.06398884E+00 0.01554552E-03    3
--0.01284710E-05 0.09441259E-09-0.04451897E+05 0.04848091E+03                   4
-MEGAET             62987GA  1C   3H   8     G  0200.00   1500.00  0600.00      1
- 0.06600990E+02 0.02284791E+00 0.01013375E-04-0.07318046E-07 0.02140197E-10    2
- 0.04071593E+05 0.05239052E+01-0.08169937E+01 0.04554296E+00 0.01053133E-03    3
--0.09079987E-06 0.06700564E-09 0.05448005E+05 0.03655502E+03                   4
-MEGAET2            62987GA  1C   5H  13     G  0200.00   1500.00  0600.00      1
- 0.08123156E+02 0.03978908E+00 0.01690979E-04-0.01308415E-06 0.03852599E-10    2
--0.08091057E+05-0.05039992E+02-0.05607499E+02 0.08187357E+00 0.01920530E-03    3
--0.01678979E-05 0.01243354E-08-0.05546688E+05 0.06163371E+03                   4
-MG                 81292MG  1               G  0200.00   5000.00  1000.00      1
- 0.02392633E+02 0.02085925E-02-0.01269898E-05 0.02553204E-09-0.04502495E-14    2
- 0.01704914E+06 0.04211876E+02 0.02416375E+02 0.05325518E-02-0.01135514E-04    3
- 0.09757325E-08-0.02898280E-11 0.01701992E+06 0.03983786E+02                   4
-MG(L)              81292MG  1               L  0200.00   2500.00  1000.00      1
- 0.02664314E+02 0.01304526E-01-0.07547418E-07 0.06776047E-10-0.01436523E-13    2
- 0.02234430E+04-0.01047801E+03 0.02161491E+02 0.04242991E-01-0.06464607E-04    3
- 0.06116790E-07-0.02090033E-10 0.02996028E+04-0.08229090E+02                   4
-MG(S)              81292MG  1               S  0200.00   2000.00  1000.00      1
- 0.02318547E+02 0.01929427E-01-0.01682130E-05 0.04131403E-09-0.01669293E-13    2
--0.07634172E+04-0.09802473E+02 0.01505637E+02 0.09217769E-01-0.01955590E-03    3
- 0.02020331E-06-0.07251403E-10-0.07226661E+04-0.06689818E+02                   4
-MG+                81292MG  1E  -1          G  0200.00   5000.00  1000.00      1
- 0.02504405E+02-0.08920014E-04 0.06671727E-07-0.02081615E-10 0.02311490E-14    2
- 0.01064936E+07 0.04292208E+02 0.02498282E+02 0.01465863E-03-0.03808341E-06    3
- 0.04118195E-09-0.01573362E-12 0.01064953E+07 0.04322873E+02                   4
-MG2                81292MG  2               G  0200.00   5000.00  1000.00      1
- 0.03671278E+02-0.02125120E-02 0.01013096E-05-0.02144628E-09 0.01719351E-13    2
- 0.03362331E+06 0.08548934E+02 0.04345606E+02-0.02080614E-01 0.01110301E-04    3
- 0.08675645E-08-0.07025087E-11 0.03346530E+06 0.05134171E+02                   4
-MG2BR4             81292BR  4MG  2          G  0200.00   5000.00  1000.00      1
- 0.01577579E+03 0.02832096E-02-0.01343784E-05 0.02764443E-09-0.02066139E-13    2
--0.09710095E+06-0.03457961E+03 0.01476089E+03 0.03361559E-01-0.02433120E-04    3
--0.05502974E-08 0.08111758E-11-0.09687714E+06-0.02950851E+03                   4
-MG2C3(S)           81292C   3MG  2          S  0200.00   2500.00  1000.00      1
- 0.01239169E+03 0.04624400E-01-0.02484800E-04 0.08656213E-08-0.01151950E-11    2
- 0.05393315E+05-0.06051988E+03-0.01026610E+02 0.07016433E+00-0.01240220E-02    3
- 0.01009934E-05-0.03082738E-09 0.07664551E+05 0.01701243E+02                   4
-MG2F4              81292F   4MG  2          G  0200.00   5000.00  1000.00      1
- 0.01441927E+03 0.01917749E-01-0.08894670E-05 0.01801607E-08-0.01331627E-12    2
--0.02113316E+07-0.04283410E+03 0.08770948E+02 0.01784847E+00-0.01109718E-03    3
--0.04603306E-07 0.04695460E-10-0.02099919E+07-0.01422645E+03                   4
-MGAL2O4(S)         81292AL  2MG  1O   4     S  0200.00   2800.00  1000.00      1
- 0.01495895E+03 0.08818509E-01-0.03160711E-04 0.01013391E-07-0.01228526E-11    2
--0.02817956E+07-0.07811436E+03-0.04868005E+02 0.01055641E+01-0.01821902E-02    3
- 0.01481432E-05-0.04514191E-09-0.02784436E+07 0.01382603E+03                   4
-MGB2(S)            81292B   2MG  1          S  0200.00   2000.00  1000.00      1
- 0.06619755E+02 0.01322195E-01 0.04697857E-05 0.03681802E-08-0.01739753E-11    2
--0.01346401E+06-0.03460640E+03 0.04176086E+02 0.06396544E-01-0.05616456E-04    3
- 0.07092297E-07-0.03442529E-10-0.01255609E+06-0.02118159E+03                   4
-MGBR               81292BR  1MG  1          G  0200.00   5000.00  1000.00      1
- 0.04385933E+02 0.01975075E-02-0.06117347E-06 0.01027103E-09-0.03876260E-14    2
--0.05584836E+05 0.04357095E+02 0.03932960E+02 0.01518559E-01-0.09413456E-05    3
--0.03806534E-08 0.04026288E-11-0.05481871E+05 0.06634707E+02                   4
-MGBR2              81292BR  2MG  1          G  0200.00   5000.00  1000.00      1
- 0.07282371E+02 0.02671005E-02-0.01246470E-05 0.02534839E-09-0.01878437E-13    2
--0.03865522E+06-0.05463838E+02 0.06436183E+02 0.02723204E-01-0.01828290E-04    3
--0.05509276E-08 0.06681264E-11-0.03845914E+06-0.01198273E+02                   4
-MGBR2+             81292BR  2MG  1E  -1     G  0200.00   5000.00  1000.00      1
- 0.07317323E+02 0.02252288E-02-0.01039562E-05 0.02025280E-09-0.01333602E-13    2
- 0.08575141E+06-0.03144653E+02 0.06600891E+02 0.02322271E-01-0.01575443E-04    3
--0.04621806E-08 0.05719750E-11 0.08591576E+06 0.04604670E+01                   4
-MGC2(S)            81292C   2MG  1          S  0200.00   2500.00  1000.00      1
- 0.07427011E+02 0.02786444E-01-0.01500518E-04 0.05235992E-08-0.06981197E-12    2
- 0.08069270E+05-0.03697419E+03-0.06510206E+01 0.04230993E+00-0.07491559E-03    3
- 0.06109534E-06-0.01867195E-09 0.09434739E+05 0.04708862E+01                   4
-MGCL               81292CL  1MG  1          G  0200.00   5000.00  1000.00      1
- 0.04335941E+02 0.02574531E-02-0.09346352E-06 0.01898185E-09-0.01405830E-13    2
--0.06564693E+05 0.03214818E+02 0.03708081E+02 0.02069048E-01-0.01328293E-04    3
--0.04347061E-08 0.05033764E-11-0.06418555E+05 0.06382778E+02                   4
-MGCL2              81292CL  2MG  1          G  0200.00   5000.00  1000.00      1
- 0.07176871E+02 0.03917414E-02-0.01814155E-05 0.03670114E-09-0.02710187E-13    2
--0.04941693E+06-0.07830507E+02 0.06000831E+02 0.03745347E-01-0.02447708E-04    3
--0.07873749E-08 0.09100925E-11-0.04913880E+06-0.01880677E+02                   4
-MGCL2(S)           81292CL  2MG  1          S  0200.00   2000.00  1000.00      1
- 0.08460549E+02 0.02204761E-01-0.06316590E-05 0.02617815E-08-0.05082748E-12    2
--0.07983216E+06-0.03816537E+03 0.04852236E+02 0.02102714E+00-0.03667994E-03    3
- 0.03032449E-06-0.09279303E-10-0.07928891E+06-0.02175204E+03                   4
-MGCO3(S)           81292C   1MG  1O   3     S  0200.00   1000.00  1000.00      1
- 0.01585340E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01402924E+07-0.08639698E+03 0.01344667E+02 0.03695912E+00-0.04452165E-03    3
- 0.03181716E-06-0.09745892E-10-0.01354278E+07-0.09041713E+02                   4
-MGF                81292F   1MG  1          G  0200.00   5000.00  1000.00      1
- 0.04166004E+02 0.04434929E-02-0.01720072E-05 0.03280565E-09-0.02190876E-13    2
--0.02980270E+06 0.02577443E+02 0.03172942E+02 0.03157075E-01-0.02008009E-04    3
--0.04636928E-08 0.06097890E-11-0.02955269E+06 0.07654193E+02                   4
-MGF2               81292F   2MG  1          G  0200.00   5000.00  1000.00      1
- 0.06314408E+02 0.08013760E-02-0.03622602E-05 0.07202929E-09-0.05250556E-13    2
--0.08944590E+06-0.05637362E+02 0.04365511E+02 0.06150098E-01-0.04077014E-04    3
--0.07490467E-08 0.01130754E-10-0.08895505E+06 0.04323487E+02                   4
-MGF2(S)            81292F   2MG  1          S  0200.00   2000.00  1000.00      1
- 0.08170168E+02 0.02353222E-01-0.01060785E-04 0.02392788E-08-0.01594861E-12    2
--0.01379692E+07-0.04083052E+03 0.01762995E+02 0.03056669E+00-0.04933989E-03    3
- 0.03778577E-06-0.01108964E-09-0.01367476E+07-0.01039233E+03                   4
-MGF2+              81292F   2MG  1E  -1     G  0200.00   5000.00  1000.00      1
- 0.06819974E+02 0.08267521E-02-0.03871799E-05 0.07864547E-09-0.05589085E-13    2
- 0.06903427E+06-0.08313943E+02 0.04782002E+02 0.06580736E-01-0.04470059E-04    3
--0.08656625E-08 0.01305586E-10 0.06953005E+06 0.02038302E+02                   4
-MGH                81292H   1MG  1          G  0200.00   5000.00  1000.00      1
- 0.03501857E+02 0.01196289E-01-0.04870483E-05 0.09616032E-09-0.06566165E-13    2
- 0.01915847E+06 0.02762077E+02 0.02929127E+02 0.02881565E-01-0.03702138E-04    3
- 0.03761425E-07-0.01569289E-10 0.01935649E+06 0.05809553E+02                   4
-MGH2(S)            81292H   2MG  1          S  0200.00   2000.00  1000.00      1
- 0.04503751E+02 0.05009365E-01-0.07076169E-05-0.09321345E-08 0.03016174E-11    2
--0.01106837E+06-0.02418625E+03-0.09052193E+00 0.01938007E+00-0.01936573E-03    3
- 0.01164904E-06-0.03397887E-10-0.09845471E+05-0.07606392E+01                   4
-MGH2O2             81292H   2MG  1O   2     G  0200.00   5000.00  1000.00      1
- 0.08302454E+02 0.03712996E-01-0.01279645E-04 0.02102831E-08-0.01337217E-12    2
--0.07153173E+06-0.01640682E+03 0.04724303E+02 0.01611746E+00-0.01291007E-03    3
- 0.05703660E-08 0.02430663E-10-0.07085783E+06 0.09898885E+01                   4
-MGH2O2(S)          81292H   2MG  1O   2     S  0200.00   1000.00  1000.00      1
- 0.01381001E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01162998E+07-0.07323205E+03-0.04220693E+02 0.07726916E+00-0.01383568E-02    3
- 0.01155986E-05-0.03648025E-09-0.01123883E+07 0.01381610E+03                   4
-MGN                81292MG  1N   1          G  0200.00   5000.00  1000.00      1
- 0.04177825E+02 0.04387980E-02-0.01726040E-05 0.03444124E-09-0.02516521E-13    2
- 0.03340716E+06 0.02969357E+02 0.03200092E+02 0.03139739E-01-0.02045035E-04    3
--0.04125930E-08 0.05937391E-11 0.03365107E+06 0.07958522E+02                   4
-MGO(S)             81292MG  1O   1          S  0200.00   4000.00  1000.00      1
- 0.04857470E+02 0.01952289E-01-0.08605956E-05 0.02101340E-08-0.01886027E-12    2
--0.07394488E+06-0.02524503E+03 0.01971740E+02 0.01095483E+00-0.08169910E-04    3
--0.06359402E-08 0.02019714E-10-0.07332016E+06-0.01088662E+03                   4
-MGOH               81292H   1MG  1O   1     G  0200.00   5000.00  1000.00      1
- 0.05156858E+02 0.01849251E-01-0.06339213E-05 0.01026031E-08-0.06282974E-13    2
--0.02145938E+06-0.02774689E+02 0.03347871E+02 0.08101305E-01-0.06443066E-04    3
- 0.02006805E-08 0.01261718E-10-0.02111816E+06 0.06024177E+02                   4
-MGOH+              81292H   1MG  1O   1E  -1G  0200.00   5000.00  1000.00      1
- 0.05171484E+02 0.01835998E-01-0.06314934E-05 0.01036229E-08-0.06583402E-13    2
- 0.06865354E+06-0.03526109E+02 0.03383351E+02 0.08055572E-01-0.06452790E-04    3
- 0.02400212E-08 0.01246873E-10 0.06898753E+06 0.05158118E+02                   4
-MGS                81292MG  1S   1          G  0200.00   5000.00  1000.00      1
- 0.01071331E+03-0.06086042E-01 0.02390833E-04-0.04174042E-08 0.02737530E-12    2
- 0.01317442E+06-0.03521998E+03 0.03789723E+02-0.03985028E-01 0.02217192E-03    3
--0.01858825E-06 0.03239714E-10 0.01635406E+06 0.05868810E+02                   4
-MGS(S)             81292MG  1S   1          S  0200.00   3000.00  1000.00      1
- 0.05581918E+02 0.08031267E-02-0.01812239E-05 0.04113088E-09-0.02798069E-13    2
--0.04331716E+06-0.02607368E+03 0.04076152E+02 0.07088011E-01-0.09604458E-04    3
- 0.06056009E-07-0.01373560E-10-0.04304232E+06-0.01890776E+03                   4
-MGSO4(S)           81292MG  1O   4S   1     S  0200.00   2500.00  1000.00      1
- 0.08845820E+02 0.01221900E+00-0.02141897E-04-0.09580988E-08 0.02954552E-11    2
--0.01549512E+07-0.04302983E+03 0.02258418E+02 0.04788929E+00-0.07110586E-03    3
- 0.05630850E-06-0.01709008E-09-0.01540505E+07-0.01345647E+03                   4
-N                 120186N   1               G  0200.00   5000.00  1000.00      1
- 0.02450268E+02 0.01066146E-02-0.07465337E-06 0.01879652E-09-0.01025984E-13    2
- 0.05611604E+06 0.04448758E+02 0.02503071E+02-0.02180018E-03 0.05420529E-06    3
--0.05647560E-09 0.02099904E-12 0.05609890E+06 0.04167566E+02                   4
-N*C3H7            120186C   3H   7          G  0200.00   5000.00  1000.00      1
- 0.07978291E+02 0.01576113E+00-0.05173243E-04 0.07443892E-08-0.03824978E-12    2
- 0.07579402E+05-0.01935611E+03 0.01922537E+02 0.02478927E+00 0.01810249E-04    3
--0.01783266E-06 0.08582996E-10 0.09713281E+05 0.01399271E+03                   4
-N2                121286N   2               G  0200.00   5000.00  1000.00      1
- 0.02926640E+02 0.01487977E-01-0.05684761E-05 0.01009704E-08-0.06753351E-13    2
--0.09227977E+04 0.05980528E+02 0.03298677E+02 0.01408240E-01-0.03963222E-04    3
- 0.05641515E-07-0.02444855E-10-0.01020900E+05 0.03950372E+02                   4
-N2H2              121286N   2H   2          G  0200.00   5000.00  1000.00      1
- 0.03371185E+02 0.06039968E-01-0.02303854E-04 0.04062789E-08-0.02713144E-12    2
- 0.02418172E+06 0.04980585E+02 0.01617999E+02 0.01306312E+00-0.01715712E-03    3
- 0.01605608E-06-0.06093639E-10 0.02467526E+06 0.01379467E+03                   4
-N2H3              120186N   2H   3          G  0200.00   5000.00  1000.00      1
- 0.04441846E+02 0.07214271E-01-0.02495684E-04 0.03920565E-08-0.02298950E-12    2
- 0.01664221E+06-0.04275205E+01 0.03174204E+02 0.04715907E-01 0.01334867E-03    3
--0.01919685E-06 0.07487564E-10 0.01727270E+06 0.07557224E+02                   4
-N2H4              121286N   2H   4          G  0200.00   5000.00  1000.00      1
- 0.04977317E+02 0.09595519E-01-0.03547639E-04 0.06124299E-08-0.04029795E-12    2
- 0.09341219E+05-0.02962990E+02 0.06442606E+00 0.02749730E+00-0.02899451E-03    3
- 0.01745240E-06-0.04422282E-10 0.01045192E+06 0.02127789E+03                   4
-N2H4(L)            90589H   4N   2          L  0200.00   0600.00  0450.00      1
- 0.08890683E+02 0.08330343E-01 0.04945549E-04-0.04909251E-08-0.03355824E-10    2
- 0.03032250E+05-0.03871433E+03 0.09047444E+02 0.09241592E-01 0.02263547E-04    3
--0.08952247E-07 0.01486863E-09 0.02970393E+05-0.03974034E+03                   4
-N2O               121286N   2O   1          G  0200.00   5000.00  1000.00      1
- 0.04718977E+02 0.02873714E-01-0.01197496E-04 0.02250552E-08-0.01575337E-12    2
- 0.08165811E+05-0.01657250E+02 0.02543058E+02 0.09492193E-01-0.09792775E-04    3
- 0.06263845E-07-0.01901826E-10 0.08765100E+05 0.09511222E+02                   4
-N2O+              121286N   2O   1E  -1     G  0200.00   5000.00  1000.00      1
- 0.05398516E+02 0.02249478E-01-0.09577057E-05 0.01823193E-08-0.01284422E-12    2
- 0.01584851E+07-0.03733146E+02 0.03187228E+02 0.08350714E-01-0.07894549E-04    3
- 0.04597445E-07-0.01381075E-10 0.01591279E+07 0.07779426E+02                   4
-N2O4              121286N   2O   4          G  0200.00   5000.00  1000.00      1
- 0.01048220E+03 0.05972272E-01-0.02564044E-04 0.04916885E-08-0.03490969E-12    2
--0.02849989E+05-0.02612289E+03 0.03624593E+02 0.02474708E+00-0.02172875E-03    3
- 0.09927104E-07-0.02222817E-10-0.09128241E+04 0.09457174E+02                   4
-N3                121286N   3               G  0200.00   5000.00  1000.00      1
- 0.05208505E+02 0.02444507E-01-0.01038941E-04 0.01977417E-08-0.01395644E-12    2
- 0.04796178E+06-0.03612756E+02 0.02882219E+02 0.08930338E-01-0.08539038E-04    3
- 0.05045585E-07-0.01521248E-10 0.04863468E+06 0.08481757E+02                   4
-NA                 80792NA  1               G  0200.00   5000.00  1000.00      1
- 0.02574480E+02-0.01605880E-02 0.01250641E-05-0.04516576E-09 0.06941745E-13    2
- 0.01219129E+06 0.03830900E+02 0.02591348E+02-0.05961520E-02 0.01327651E-04    3
--0.01211123E-07 0.03890067E-11 0.01220642E+06 0.03841789E+02                   4
-NA(L)              81092NA  1               L  0200.00   2000.00  1000.00      1
- 0.04030581E+02-0.01320419E-01 0.04136604E-05 0.05486936E-08-0.01916626E-11    2
--0.07899189E+04-0.01548589E+03 0.04682137E+02-0.03624112E-01 0.04776195E-04    3
--0.03871514E-07 0.01518150E-10-0.09807172E+04-0.01881830E+03                   4
-NA+                80792NA  1E  -1          G  0200.00   5000.00  1000.00      1
- 0.02500252E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.07260903E+06 0.03538490E+02 0.02500252E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.07260904E+06 0.03538490E+02                   4
-NA2                80792NA  2               G  0200.00   5000.00  1000.00      1
- 0.04480669E+02 0.02178011E-02-0.01102830E-06 0.02208498E-10-0.01614866E-14    2
- 0.01519313E+06 0.02073203E+02 0.04369675E+02 0.05850265E-02-0.03825359E-05    3
- 0.08752245E-09 0.02980178E-12 0.01521703E+06 0.02622521E+02                   4
-NA2B4O7(S)         81292B   4NA  2O   7     S  0200.00   2000.00  1000.00      1
- 0.02061542E+03 0.01728323E+00-0.04016503E-04-0.07600982E-08 0.05580242E-11    2
--0.04014288E+07-0.01006093E+04 0.01430907E+02 0.01167214E+01-0.02000861E-02    3
- 0.01698028E-05-0.05418888E-09-0.03982982E+07-0.01265829E+03                   4
-NA2B6O10(S)        81292B   6NA  2O  10     S  0200.00   2000.00  1000.00      1
- 0.02989617E+03 0.03053411E+00-0.02146684E-04-0.04458443E-07 0.09406424E-11    2
--0.05638429E+07-0.01571271E+04 0.09347958E+02 0.08948274E+00-0.01024848E-02    3
- 0.01015647E-05-0.04314482E-09-0.05570116E+07-0.04828430E+03                   4
-NA2C2N2            81292C   2N   2NA  2     G  0200.00   5000.00  1000.00      1
- 0.01253426E+03 0.03485206E-01-0.01426483E-04 0.02648455E-08-0.01838071E-12    2
--0.05033986E+05-0.03087649E+03 0.01092445E+03 0.09724206E-01-0.01190420E-03    3
- 0.08942515E-07-0.02847524E-10-0.04654688E+05-0.02294170E+03                   4
-NA2F2              80792F   2NA  2          G  0200.00   5000.00  1000.00      1
- 0.09265403E+02 0.09044011E-02-0.04233919E-05 0.08630666E-09-0.06408558E-13    2
--0.01047310E+07-0.01880290E+03 0.06422050E+02 0.09031559E-01-0.05593408E-04    3
--0.02581729E-07 0.02547837E-10-0.01040718E+07-0.04453081E+02                   4
-NA2H2O2            80792H   2NA  2O   2     G  0200.00   5000.00  1000.00      1
- 0.09347846E+02 0.05678318E-01-0.02077824E-04 0.03568716E-08-0.02342868E-12    2
--0.07634945E+06-0.01850110E+03 0.05441492E+02 0.01814821E+00-0.01733029E-03    3
- 0.09077551E-07-0.02055174E-10-0.07536770E+06 0.01240430E+02                   4
-NA2O(L)            81092NA  2O   1          L  0200.00   3000.00  1000.00      1
- 0.01258178E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.04859891E+06-0.06066678E+03 0.01258178E+03 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.04859891E+06-0.06066677E+03                   4
-NA2O(S)            81092NA  2O   1          S  0200.00   2000.00  1000.00      1
- 0.08804423E+02 0.03253428E-01-0.03530522E-05-0.04324117E-08 0.01394574E-11    2
--0.05257507E+06-0.04209654E+03 0.04776964E+02 0.01483269E+00-0.01052247E-03    3
- 0.01278469E-07 0.01046187E-10-0.05155651E+06-0.02156737E+03                   4
-NA2O2              81092NA  2O   2          S  0200.00   2500.00  1000.00      1
- 0.01382402E+03-0.03556455E-02 0.02837263E-05-0.09701692E-09 0.01205762E-12    2
--0.06583802E+06-0.06789536E+03 0.08035418E+02 0.05983777E-01 0.01935571E-03    3
--0.03410482E-06 0.01439706E-09-0.06395152E+06-0.03604480E+03                   4
-NA2SO4             80792NA  2O   4S   1     G  0200.00   5000.00  1000.00      1
- 0.01506456E+03 0.04508233E-01-0.02011474E-04 0.03963989E-08-0.02871466E-12    2
--0.01296053E+07-0.04683857E+03 0.05752581E+02 0.02964118E+00-0.02035211E-03    3
--0.01073243E-07 0.03960597E-10-0.01271767E+07 0.01016246E+02                   4
-NA2SO4(D)          81092NA  2O   4S   1     S  0200.00   1500.00  1000.00      1
- 0.01062092E+03 0.01179912E+00 0.03608537E-04-0.03424054E-09-0.09650399E-11    2
--0.01684493E+07-0.04191208E+03 0.01187237E+03 0.04287018E+00-0.09072926E-03    3
- 0.09042235E-06-0.02940634E-09-0.01707163E+07-0.05750085E+03                   4
-NA2SO4(i)          81092NA  2O   4S   1     S  0200.00   1500.00  1000.00      1
- 0.01711668E+03 0.05878399E-01 0.01196697E-04 0.01676018E-08-0.02640822E-11    2
--0.01714447E+07-0.07997372E+03 0.01674756E+03 0.01133662E+00-0.01526634E-03    3
- 0.01819548E-06-0.06918027E-10-0.01714932E+07-0.07899648E+03                   4
-NA2SO4(iii)        81092NA  2O   4S   1     S  0200.00   1000.00  1000.00      1
- 0.03701786E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01854858E+07-0.02084472E+04 0.01413394E+03-0.01694491E+00 0.09403022E-03    3
--0.07815722E-06 0.02395583E-09-0.01707247E+07-0.06037737E+03                   4
-NA2SO4(iv)         81092NA  2O   4S   1     S  0200.00   1000.00  1000.00      1
- 0.02590382E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01779857E+07-0.01365608E+04 0.05917499E+02 0.04507074E+00-0.05672574E-03    3
- 0.04596655E-06-0.01432523E-09-0.01702527E+07-0.02694892E+03                   4
-NA2SO4(v)          81092NA  2O   4S   1     S  0200.00   1000.00  1000.00      1
- 0.02590382E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01780169E+07-0.01366284E+04 0.05917499E+02 0.04507074E+00-0.05672574E-03    3
- 0.04596655E-06-0.01432523E-09-0.01702840E+07-0.02701654E+03                   4
-NA3CL6AL(S)        81292AL  1CL  6NA  3     S  0200.00   2000.00  1000.00      1
- 0.02863182E+03 0.08169580E-01 0.01787040E-05-0.09984084E-08 0.01787581E-11    2
--0.02473307E+07-0.01246570E+04 0.02610594E+03 0.09148861E-01 0.09743193E-04    3
--0.01296166E-06 0.04124132E-10-0.02462808E+07-0.01099689E+04                   4
-NA3F6AL(S)         81292AL  1F   6NA  3     S  0200.00   1200.00  1000.00      1
- 0.01867366E+03 0.02426805E+00 0.01311169E-04-0.01223061E-06 0.06326451E-10    2
--0.04056682E+07-0.08492075E+03 0.01182130E+03 0.07831376E+00-0.01387551E-02    3
- 0.01331742E-05-0.04620547E-09-0.04049948E+07-0.05693419E+03                   4
-NABH4(S)           81292B   1H   4NA  1     S  0200.00   2000.00  1000.00      1
- 0.08204329E+02 0.01008304E+00-0.01032261E-04-0.02815504E-07 0.09005147E-11    2
--0.02614390E+06-0.03790153E+03 0.08076391E+02 0.05407829E-01 0.01208139E-03    3
--0.01450540E-06 0.04279918E-10-0.02580298E+06-0.03584760E+03                   4
-NABO2              81092B   1NA  1O   2     G  0200.00   5000.00  1000.00      1
- 0.07449052E+02 0.02730088E-01-0.01165145E-04 0.02226924E-08-0.01578063E-12    2
--0.08056425E+06-0.09194809E+02 0.04413702E+02 0.01144045E+00-0.01021892E-03    3
- 0.04340556E-07-0.07548787E-11-0.07974780E+06 0.06401325E+02                   4
-NABO2(S)           81292B   1NA  1O   2     S  0200.00   2000.00  1000.00      1
- 0.07820448E+02 0.06702746E-01-0.01488126E-04-0.01033983E-07 0.04130615E-11    2
--0.01203511E+07-0.03848530E+03 0.01695994E+02 0.03131723E+00-0.04453876E-03    3
- 0.03572163E-06-0.01178195E-09-0.01189335E+07-0.08471359E+02                   4
-NABR               81092BR  1NA  1          G  0200.00   5000.00  1000.00      1
- 0.04424304E+02 0.01887477E-02-0.04500799E-06 0.09226701E-10-0.06871650E-14    2
--0.01865205E+06 0.03707466E+02 0.04097639E+02 0.01170972E-01-0.07798224E-05    3
--0.01611608E-08 0.02489549E-11-0.01857889E+06 0.05343556E+02                   4
-NABR(L)            81292BR  1NA  1          L  0200.00   2500.00  1000.00      1
- 0.07498742E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.04305332E+06-0.03017306E+03 0.07498742E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.04305333E+06-0.03017306E+03                   4
-NABR(S)            81292BR  1NA  1          S  0200.00   2000.00  1000.00      1
- 0.05741811E+02 0.01766697E-01-0.01899553E-05 0.01473021E-09 0.01715605E-12    2
--0.04526151E+06-0.02279248E+03 0.04706446E+02 0.08010188E-01-0.01346175E-03    3
- 0.01196933E-06-0.03873765E-10-0.04513442E+06-0.01826015E+03                   4
-NACH               80792C   1N   1NA  1     G  0200.00   5000.00  1000.00      1
- 0.05791865E+02 0.01708993E-01-0.06965832E-05 0.01288980E-08-0.08921502E-13    2
- 0.09496355E+05-0.04320624E+02 0.05123989E+02 0.04411283E-01-0.05682223E-04    3
- 0.04664804E-07-0.01593603E-10 0.09657925E+05-0.01032367E+02                   4
-NACL               81092CL  1NA  1          G  0200.00   5000.00  1000.00      1
- 0.04393820E+02 0.02153336E-02-0.06198756E-06 0.01266879E-09-0.09427806E-14    2
--0.02315864E+06 0.02486064E+02 0.03953003E+02 0.01514187E-01-0.09819465E-05    3
--0.02807090E-08 0.03543574E-11-0.02305831E+06 0.04701214E+02                   4
-NACL(S)            81092CL  1NA  1          S  0200.00   1500.00  1000.00      1
- 0.07639640E+02-0.03933726E-01 0.02071020E-04 0.04233998E-07-0.02204761E-10    2
--0.05163684E+06-0.03397957E+03 0.04982695E+02 0.05432908E-01-0.07698454E-04    3
- 0.06300821E-07-0.01211800E-10-0.05112201E+06-0.02104512E+03                   4
-NACL4AL(S)         81292AL  1CL  4NA  1     S  0200.00   2000.00  1000.00      1
- 0.02138498E+03 0.03252454E-01-0.01769716E-05-0.07072990E-08 0.01928080E-11    2
--0.01447874E+07-0.01021539E+04 0.01588411E+03 0.04527768E-01 0.02409928E-03    3
--0.03108224E-06 0.01051706E-09-0.01424874E+07-0.07002475E+03                   4
-NACN               81092C   1N   1NA  1     G  0200.00   5000.00  1000.00      1
- 0.05791865E+02 0.01708993E-01-0.06965832E-05 0.01288980E-08-0.08921502E-13    2
- 0.09496355E+05-0.04320624E+02 0.05123989E+02 0.04411283E-01-0.05682223E-04    3
- 0.04664804E-07-0.01593603E-10 0.09657925E+05-0.01032367E+02                   4
-NACN(S)            81292C   1N   1NA  1     S  0200.00   2000.00  1000.00      1
- 0.08137501E+02 0.03044670E-02-0.01811052E-05 0.08281245E-09-0.01435891E-12    2
--0.01334049E+06-0.03217693E+03 0.08239171E+02-0.05281579E-03 0.03829305E-05    3
--0.03800801E-08 0.01401136E-11-0.01336670E+06-0.03268830E+03                   4
-NAF                80792F   1NA  1          G  0200.00   5000.00  1000.00      1
- 0.04289078E+02 0.03377828E-02-0.01184403E-05 0.02398348E-09-0.01772778E-13    2
--0.03626513E+06 0.01538309E+02 0.03532346E+02 0.02495132E-01-0.01587195E-04    3
--0.04836335E-08 0.05739804E-11-0.03608573E+06 0.05367920E+02                   4
-NAF2-              81092F   2NA  1E   1     G  0200.00   5000.00  1000.00      1
- 0.07032279E+02 0.05655084E-02-0.02615340E-05 0.05285863E-09-0.03900402E-13    2
--0.08272088E+06-0.01028459E+03 0.05382830E+02 0.05231638E-01-0.03350411E-04    3
--0.01169983E-07 0.01291137E-10-0.08232816E+06-0.01928436E+02                   4
-NAF4AL             81092AL  1F   4NA  1     G  0200.00   5000.00  1000.00      1
- 0.01407161E+03 0.02285303E-01-0.01043457E-04 0.02090484E-08-0.01532874E-12    2
--0.02260449E+07-0.04013149E+03 0.08103421E+02 0.01881143E+00-0.01205279E-03    3
--0.03477927E-07 0.04123038E-10-0.02245760E+07-0.09731781E+02                   4
-NAH                80792H   1NA  1          G  0200.00   5000.00  1000.00      1
- 0.03818649E+02 0.08597439E-02-0.03202059E-05 0.06146711E-09-0.04364567E-13    2
- 0.01368120E+06 0.04367959E+01 0.02864363E+02 0.03308582E-01-0.02753919E-04    3
- 0.01399522E-07-0.04032581E-11 0.01396756E+06 0.05450493E+02                   4
-NAI(S)             81292I   1NA  1          S  0200.00   2000.00  1000.00      1
- 0.05987605E+02 0.01342139E-01-0.03807255E-06 0.01660138E-09-0.06066889E-13    2
--0.03648630E+06-0.02270427E+03 0.05407032E+02 0.04235908E-01-0.05679955E-04    3
- 0.04941357E-07-0.01602135E-10-0.03638396E+06-0.02000921E+03                   4
-NAO                80792NA  1O   1          G  0200.00   5000.00  1000.00      1
- 0.04349803E+02 0.02849959E-02-0.08615992E-06 0.01754054E-09-0.01301677E-13    2
- 0.08731694E+05 0.02618339E+02 0.03765728E+02 0.01980031E-01-0.01256303E-04    3
--0.03909831E-08 0.04664039E-11 0.08866889E+05 0.05562273E+02                   4
-NAO-               80792NA  1O   1E   1     G  0200.00   5000.00  1000.00      1
- 0.04343846E+02 0.02955424E-02-0.08923111E-06 0.01813572E-09-0.01343290E-13    2
--0.01592823E+06 0.01245911E+02 0.03740064E+02 0.02044313E-01-0.01291719E-04    3
--0.04080754E-08 0.04823669E-11-0.01578820E+06 0.04290303E+02                   4
-NAO2(S)            81092NA  1O   2          S  0200.00   2000.00  1000.00      1
- 0.07379480E+02 0.04377048E-01 0.06355202E-05-0.03238946E-08 0.06014399E-12    2
--0.03376432E+06-0.02946090E+03 0.07236605E+02 0.04751740E-01 0.03458707E-05    3
--0.02971627E-08 0.09124652E-12-0.03372514E+06-0.02872050E+03                   4
-NAO2AL(S)          81292AL  1NA  1O   2     S  0200.00   3000.00  1000.00      1
- 0.09963634E+02 0.02329677E-01-0.08188510E-07 0.02070425E-09-0.02306699E-12    2
--0.01394255E+07-0.04932653E+03 0.03669741E+02 0.02226343E+00-0.01558734E-03    3
--0.03446683E-07 0.05383614E-10-0.01381199E+07-0.01818990E+03                   4
-NAOH               80792H   1NA  1O   1     G  0200.00   5000.00  1000.00      1
- 0.05527852E+02 0.01420623E-01-0.04439615E-05 0.06635639E-09-0.03866820E-13    2
--0.02545869E+06-0.04374785E+02 0.04727895E+02 0.05001262E-01-0.04534391E-04    3
- 0.07051240E-08 0.06671123E-11-0.02537947E+06-0.07649678E+01                   4
-NAOH(L)            81092H   1NA  1O   1     L  0200.00   2500.00  1000.00      1
- 0.01061400E+03-0.03116447E-02-0.02964198E-05 0.05475463E-09 0.01021178E-12    2
--0.05327943E+06-0.05120959E+03 0.01079389E+03-0.08545728E-02 0.03780039E-05    3
--0.03848777E-08 0.01384542E-11-0.05332840E+06-0.05213201E+03                   4
-NAOH+              80792H   1NA  1O   1E  -1G  0200.00   5000.00  1000.00      1
- 0.05570452E+02 0.01387979E-01-0.04311444E-05 0.06372652E-09-0.03648954E-13    2
- 0.07985595E+06-0.02878876E+02 0.04974624E+02 0.04424591E-01-0.04296418E-04    3
- 0.01067747E-07 0.04168198E-11 0.07988680E+06-0.03068088E+01                   4
-NCN               103190C   1N   2          G  0200.00   4000.00  1500.00      1
- 0.06652121E+02 0.06108034E-02-0.01389727E-05 0.02695549E-10 0.01669944E-13    2
- 0.05172403E+06-0.01138517E+03 0.03101270E+02 0.09981674E-01-0.09920701E-04    3
- 0.04758919E-07-0.08968626E-11 0.05285757E+06 0.07317579E+02                   4
-NCO               110193C   1N   1O   1     G  0200.00   4000.00  1400.00      1
- 0.06072346E+02 0.09227829E-02-0.09845574E-06-0.04764123E-09 0.09090445E-13    2
- 0.01359820E+06-0.08507293E+02 0.03359593E+02 0.05393239E-01-0.08144585E-05    3
--0.01912868E-07 0.07836794E-11 0.01462809E+06 0.06549694E+02                   4
-NF                121286N   1F   1          G  0200.00   5000.00  1000.00      1
- 0.03862177E+02 0.07551806E-02-0.03044943E-05 0.05874447E-09-0.04187479E-13    2
- 0.02867243E+06 0.03457233E+02 0.02871947E+02 0.03312193E-01-0.02691159E-04    3
- 0.01121951E-07-0.02475131E-11 0.02896257E+06 0.08640247E+02                   4
-NFO               121286N   1F   1O   1     G  0200.00   5000.00  1000.00      1
- 0.05174520E+02 0.01938472E-01-0.08222701E-05 0.01564291E-08-0.01104497E-12    2
--0.09670935E+05-0.05352461E+01 0.03352307E+02 0.07229966E-01-0.06951137E-04    3
- 0.03828526E-07-0.01023558E-10-0.09167035E+05 0.08854189E+02                   4
-NFO2              121286N   1F   1O   2     G  0200.00   5000.00  1000.00      1
- 0.06816857E+02 0.03462640E-01-0.01492216E-04 0.02869665E-08-0.02041857E-12    2
--0.01560262E+06-0.09320129E+02 0.02447529E+02 0.01544110E+00-0.01300595E-03    3
- 0.04856383E-07-0.06852266E-11-0.01439400E+06 0.01328360E+03                   4
-NH                 31387H   1N   1          G  0200.00   5000.00  1000.00      1
- 0.02760249E+02 0.01375346E-01-0.04451914E-05 0.07692792E-09-0.05017592E-13    2
- 0.04207828E+06 0.05857199E+02 0.03339758E+02 0.01253009E-01-0.03491646E-04    3
- 0.04218812E-07-0.01557618E-10 0.04185047E+06 0.02507181E+02                   4
-NH2               121686N   1H   2          G  0200.00   5000.00  1000.00      1
- 0.02961311E+02 0.02932699E-01-0.09063600E-05 0.01617257E-08-0.01204200E-12    2
- 0.02191977E+06 0.05777878E+02 0.03432493E+02 0.03299540E-01-0.06613600E-04    3
- 0.08590947E-07-0.03572047E-10 0.02177228E+06 0.03090111E+02                   4
-NH3               121386N   1H   3          G  0200.00   5000.00  1000.00      1
- 0.02461904E+02 0.06059166E-01-0.02004977E-04 0.03136003E-08-0.01938317E-12    2
--0.06493270E+05 0.07472097E+02 0.02204352E+02 0.01011476E+00-0.01465265E-03    3
- 0.01447235E-06-0.05328509E-10-0.06525488E+05 0.08127138E+02                   4
-NNH               120186N   2H   1          G  0250.00   4000.00  1000.00      1
- 0.04415342E+02 0.01614388E-01-0.01632894E-05-0.08559846E-09 0.01614791E-12    2
- 0.02788029E+06 0.09042888E+01 0.03501344E+02 0.02053587E-01 0.07170410E-05    3
- 0.04921348E-08-0.09671170E-11 0.02833347E+06 0.06391837E+02                   4
-NO                121286N   1O   1          G  0200.00   5000.00  1000.00      1
- 0.03245435E+02 0.01269138E-01-0.05015890E-05 0.09169283E-09-0.06275419E-13    2
- 0.09800840E+05 0.06417294E+02 0.03376542E+02 0.01253063E-01-0.03302751E-04    3
- 0.05217810E-07-0.02446263E-10 0.09817961E+05 0.05829590E+02                   4
-NO+               121286N   1O   1E  -1     G  0200.00   5000.00  1000.00      1
- 0.02914889E+02 0.01499335E-01-0.05727972E-05 0.01017777E-08-0.06825390E-13    2
- 0.01181869E+07 0.06844346E+02 0.03297349E+02 0.01422890E-01-0.04007441E-04    3
- 0.05670551E-07-0.02446972E-10 0.01180834E+07 0.04749948E+02                   4
-NO2               121286N   1O   2          G  0200.00   5000.00  1000.00      1
- 0.04682859E+02 0.02462429E-01-0.01042259E-04 0.01976902E-08-0.01391717E-12    2
- 0.02261292E+05 0.09885985E+01 0.02670600E+02 0.07838501E-01-0.08063865E-04    3
- 0.06161715E-07-0.02320150E-10 0.02896291E+05 0.01161207E+03                   4
-NO2-              121286N   1O   2E   1     G  0200.00   5000.00  1000.00      1
- 0.05043114E+02 0.02166428E-01-0.09455454E-05 0.01816314E-08-0.01238394E-12    2
--0.02621554E+06-0.01445905E+02 0.02448586E+02 0.08982507E-01-0.07853431E-04    3
- 0.03927277E-07-0.01071694E-10-0.02545097E+06 0.01213060E+03                   4
-NO3               121286N   1O   3          G  0200.00   5000.00  1000.00      1
- 0.07120307E+02 0.03246228E-01-0.01431613E-04 0.02797053E-08-0.02013008E-12    2
- 0.05864479E+05-0.01213730E+03 0.01221076E+02 0.01878797E+00-0.01344321E-03    3
- 0.01274601E-07 0.01354060E-10 0.07473144E+05 0.01840203E+03                   4
-O                 120186O   1               G  0200.00   5000.00  1000.00      1
- 0.02542060E+02-0.02755062E-03-0.03102803E-07 0.04551067E-10-0.04368052E-14    2
- 0.02923080E+06 0.04920308E+02 0.02946429E+02-0.01638166E-01 0.02421032E-04    3
--0.01602843E-07 0.03890696E-11 0.02914764E+06 0.02963995E+02                   4
-O+                121286O   1E  -1          G  0200.00   5000.00  1000.00      1
- 0.02501869E+02-0.06107262E-04 0.07324307E-07-0.03438353E-10 0.05506408E-14    2
- 0.01879553E+07 0.04372827E+02 0.02499273E+02 0.05820598E-04-0.01120922E-06    3
- 0.08232109E-10-0.01916378E-13 0.01879557E+07 0.04384826E+02                   4
-O-                 90589O   1E   1          G  0200.00   5000.00  1000.00      1
- 0.02559581E+02-0.07147888E-03 0.03301804E-06-0.06660944E-10 0.04900727E-14    2
- 0.01148935E+06 0.04426187E+02 0.02747263E+02-0.05724860E-02 0.02712548E-05    3
- 0.02691512E-08-0.02002357E-11 0.01144395E+06 0.03469852E+02                   4
-O2                121386O   2               G  0200.00   5000.00  1000.00      1
- 0.03697578E+02 0.06135197E-02-0.01258842E-05 0.01775281E-09-0.01136435E-13    2
--0.01233930E+05 0.03189166E+02 0.03212936E+02 0.01127486E-01-0.05756150E-05    3
- 0.01313877E-07-0.08768554E-11-0.01005249E+05 0.06034738E+02                   4
-O2-               121286O   2E   1          G  0200.00   5000.00  1000.00      1
- 0.03883013E+02 0.07407872E-02-0.02961776E-05 0.05724305E-09-0.04086548E-13    2
--0.07121644E+05 0.02658212E+02 0.02872292E+02 0.03359716E-01-0.02664886E-04    3
- 0.09807524E-08-0.01670957E-11-0.06829094E+05 0.07938373E+02                   4
-O3                121286O   3               G  0200.00   5000.00  1000.00      1
- 0.05429371E+02 0.01820380E-01-0.07705607E-05 0.01499293E-08-0.01075563E-12    2
- 0.01523527E+06-0.03266387E+02 0.02462609E+02 0.09582781E-01-0.07087359E-04    3
- 0.01363368E-07 0.02969647E-11 0.01606152E+06 0.01214187E+03                   4
-OC(OH)2           103190C   1H   2O   3     G  0200.00   4000.00  1500.00      1
- 0.01143196E+03 0.02555103E-01-0.04326538E-05-0.05781341E-09 0.01545461E-12    2
--0.07904865E+06-0.03657201E+03 0.03540332E+01 0.03042528E+00-0.02939616E-03    3
- 0.01452934E-06-0.02906245E-10-0.07522630E+06 0.02250923E+03                   4
-OCHCHO            103190C   2H   2O   2     G  0200.00   4000.00  1500.00      1
- 0.01056843E+03 0.02907353E-01-0.03452401E-05-0.01037593E-08 0.02042135E-12    2
--0.02952623E+06-0.03104084E+03 0.01863564E+02 0.02298297E+00-0.01917997E-03    3
- 0.08558604E-07-0.01612346E-10-0.02634847E+06 0.01601674E+03                   4
-OCHNNHO           103190C   1H   2N   2O   2G  0200.00   4000.00  1500.00      1
- 0.01241397E+03 0.04091551E-01-0.04547841E-05-0.01752324E-08 0.03271472E-12    2
--0.06754774E+05-0.04078722E+03 0.01405275E+02 0.02776281E+00-0.02088466E-03    3
- 0.08550259E-07-0.01543486E-10-0.02537631E+05 0.01937723E+03                   4
-OH                121286O   1H   1          G  0200.00   5000.00  1000.00      1
- 0.02882730E+02 0.01013974E-01-0.02276877E-05 0.02174684E-09-0.05126305E-14    2
- 0.03886888E+05 0.05595712E+02 0.03637266E+02 0.01850910E-02-0.01676165E-04    3
- 0.02387203E-07-0.08431442E-11 0.03606782E+05 0.01358860E+02                   4
-OH+               121286O   1H   1E  -1     G  0200.00   5000.00  1000.00      1
- 0.02719059E+02 0.01508571E-01-0.05029369E-05 0.08261952E-09-0.04947453E-13    2
- 0.01576341E+07 0.06234536E+02 0.03326979E+02 0.01345786E-01-0.03777168E-04    3
- 0.04687750E-07-0.01780982E-10 0.01574029E+07 0.02744042E+02                   4
-OH-               121286O   1H   1E   1     G  0200.00   5000.00  1000.00      1
- 0.02846205E+02 0.01041835E-01-0.02416851E-05 0.02483215E-09-0.07775605E-14    2
--0.01807280E+06 0.04422712E+02 0.03390038E+02 0.07922381E-02-0.01943430E-04    3
- 0.02001770E-07-0.05702087E-11-0.01830494E+06 0.01249892E+02                   4
-ONHNHO            103190H   2N   2O   2     G  0200.00   4000.00  1500.00      1
- 0.01005510E+03 0.03525461E-01-0.03868362E-05-0.01298654E-08 0.02398500E-12    2
- 0.07381692E+05-0.02950581E+03 0.07815142E+01 0.02605711E+00-0.02264714E-03    3
- 0.01049925E-06-0.02012847E-10 0.01062778E+06 0.02017946E+03                   4
-ONHNOH            103190H   2N   2O   2     G  0200.00   4000.00  1500.00      1
- 0.01120874E+03 0.02650303E-01-0.03760644E-05-0.06355768E-09 0.01466251E-12    2
--0.05721250E+05-0.03476475E+03 0.01053271E+02 0.02809676E+00-0.02637380E-03    3
- 0.01270757E-06-0.02478550E-10-0.02244769E+05 0.01937011E+03                   4
-S                 121286S   1               G  0200.00   5000.00  1000.00      1
- 0.02902148E+02-0.05484546E-02 0.02764576E-05-0.05017115E-09 0.03150685E-13    2
- 0.03249423E+06 0.03838471E+02 0.03187329E+02-0.01595776E-01 0.02005531E-04    3
--0.01507081E-07 0.04931282E-11 0.03242259E+06 0.02414441E+02                   4
-S(L)              120186S   1               L  0388.36   2000.00  1000.00      1
- 0.03603667E+02 0.09903341E-02-0.01011441E-04 0.04053633E-08-0.05667914E-12    2
--0.08453839E+04-0.01634471E+03-0.01270631E+03 0.09072521E+00-0.01695179E-02    3
- 0.01307064E-05-0.03527615E-09 0.01234607E+05 0.05621016E+03                   4
-S(S)              120186S   1               S  0200.00   0388.36  0388.36      1
- 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.00000000E+00 0.00000000E+00-0.05063703E+02 0.02881935E-01-0.02133020E-03    3
- 0.08478786E-05-0.01734497E-07 0.07148263E+04 0.02871407E+03                   4
-S+                121286S   1E  -1          G  0200.00   5000.00  1000.00      1
- 0.02404600E+02 0.02410909E-02-0.02041780E-05 0.06592945E-09-0.05756939E-13    2
- 0.01535223E+07 0.05924256E+02 0.02366101E+02 0.09130767E-02-0.02140284E-04    3
- 0.02076178E-07-0.07133859E-11 0.01535091E+07 0.05993094E+02                   4
-S-TRIAZINE         41687C   3N   3H   3     G  0200.00   4000.00  1000.00      1
- 0.01303617E+03 0.07711820E-01-0.07724374E-05-0.04385191E-08 0.08298992E-12    2
- 0.02251663E+06-0.04777676E+03 0.04493492E+01 0.02728306E+00 0.02309305E-04    3
--0.01496844E-06 0.04546753E-10 0.02703032E+06 0.02178518E+03                   4
-S2                121386S   2               G  0200.00   5000.00  1000.00      1
- 0.03904443E+02 0.06925733E-02-0.01233097E-05 0.08783809E-11 0.01374662E-13    2
- 0.01425693E+06 0.04956834E+02 0.03157673E+02 0.03099480E-01-0.01560746E-04    3
--0.01357891E-07 0.01137444E-10 0.01439187E+06 0.08596062E+02                   4
-SH                121286S   1H   1          G  0200.00   5000.00  1000.00      1
- 0.03053810E+02 0.01258884E-01-0.04249169E-05 0.06929591E-09-0.04281691E-13    2
- 0.01588225E+06 0.05973551E+02 0.04133327E+02-0.03787893E-02-0.02777854E-04    3
- 0.05370112E-07-0.02394006E-10 0.01555862E+06 0.01611535E+01                   4
-SI                 32989SI  1               G  0200.00   4000.00  1000.00      1
- 0.02775846E+02-0.06213257E-02 0.04843696E-05-0.01275615E-08 0.01134482E-12    2
- 0.05339791E+06 0.04543298E+02 0.03113515E+02-0.02330991E-01 0.03518531E-04    3
--0.02417573E-07 0.06391902E-11 0.05335062E+06 0.03009719E+02                   4
-SI(CH3)2           61991H   6C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.01092572E+03 0.07986807E-01-0.09096208E-06-0.01014552E-07 0.02037989E-11    2
- 0.01132561E+06-0.02834187E+03 0.02308663E+02 0.02773810E+00-0.01799333E-03    3
- 0.06733023E-07-0.01154743E-10 0.01442892E+06 0.01819319E+03                   4
-SI(CH3)3           61991H   9C   3SI  1     G  0200.00   2500.00  1500.00      1
- 0.01536389E+03 0.01242119E+00-0.01189769E-05-0.01630302E-07 0.03308576E-11    2
--0.05218398E+05-0.05088962E+03 0.03907073E+02 0.03734813E+00-0.02072025E-03    3
- 0.06180575E-07-0.08429605E-11-0.01002462E+05 0.01138100E+03                   4
-SI(CH3)3CH2        61991H  11C   4SI  1     G  0200.00   2500.00  1500.00      1
- 0.02061565E+03 0.01408136E+00-0.01497876E-05-0.01748111E-07 0.03468780E-11    2
--0.01240235E+06-0.07596671E+03 0.05258771E+02 0.04995369E+00-0.03393958E-03    3
- 0.01367592E-06-0.02513506E-10-0.06886708E+05 0.06814728E+02                   4
-SI(CH3)4           61991H  12C   4SI  1     G  0200.00   2500.00  1500.00      1
- 0.02023461E+03 0.01648004E+00-0.01486572E-05-0.02161245E-07 0.04377236E-11    2
--0.03702410E+06-0.07661021E+03 0.05009315E+02 0.04952953E+00-0.02745875E-03    3
- 0.08231031E-07-0.01137614E-10-0.03140314E+06 0.06187860E+02                   4
-SI(L)              90589SI  1               L  0200.00   4500.00  1000.00      1
- 0.03271263E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.04855058E+05-0.01329054E+03 0.03271263E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.04855059E+05-0.01329054E+03                   4
-SI(NH2)3           42489SI  1N   3H   6     G  0200.00   3000.00  1000.00      1
- 0.01406550E+03 0.07581744E-01-0.05168510E-05-0.06743626E-08 0.01397926E-11    2
--0.01414403E+06-0.04063874E+03 0.07598413E+02 0.02435266E+00-0.04296202E-04    3
--0.01756007E-06 0.01050102E-09-0.01265343E+06-0.07808647E+02                   4
-SI(NH2)4           22790SI  1N   4H   8     G  0200.00   4000.00  1000.00      1
- 0.02032107E+03 0.08289798E-01-0.07077612E-05-0.04340724E-08 0.07747068E-12    2
--0.05389855E+06-0.07730464E+03 0.08454529E+02 0.03465772E+00-0.04266782E-04    3
--0.02495363E-06 0.01365466E-09-0.05061518E+06-0.01514301E+03                   4
-SI(S)              90589SI  1               S  0200.00   2500.00  1000.00      1
- 0.02530275E+02 0.08522433E-02-0.03223469E-05 0.01280821E-08-0.01850849E-12    2
--0.08395197E+04-0.01251478E+03 0.05746418E+01 0.01026485E+00-0.01775346E-03    3
- 0.01457500E-06-0.04491292E-10-0.04969951E+04-0.03400243E+02                   4
-SI2               111191SI  2               G  0200.00   4000.00  1500.00      1
- 0.04402888E+02 0.01154530E-02-0.06005177E-06 0.01469072E-09-0.01357408E-13    2
- 0.07199220E+06 0.02340066E+02 0.03439839E+02 0.03440171E-01-0.04437681E-04    3
- 0.02559961E-07-0.05474618E-11 0.07222934E+06 0.07148545E+02                   4
-SI2C              112989C   1SI  2          G  0200.00   5000.00  1000.00      1
- 0.06334110E+02 0.01210252E-01-0.06798289E-05 0.02244433E-08-0.02280178E-12    2
- 0.06227189E+06-0.07770097E+02 0.04157246E+02 0.07031825E-01-0.07263033E-04    3
- 0.04633583E-07-0.01493448E-10 0.06292421E+06 0.03635126E+02                   4
-SI2CL5             40992SI  2CL  5          G  0200.00   4000.00  1500.00      1
- 0.01800427E+03 0.05920529E-02-0.03159743E-05 0.07962538E-09-0.07553642E-13    2
--0.08208587E+06-0.04815622E+03 0.01218195E+03 0.02086930E+00-0.02723261E-03    3
- 0.01583266E-06-0.03404617E-10-0.08066122E+06-0.01913372E+03                   4
-SI2CL5H            40992H   1SI  2CL  5     G  0200.00   4000.00  1500.00      1
- 0.01977366E+03 0.01346980E-01-0.04241463E-05 0.05994784E-09-0.03079337E-13    2
--0.01018307E+07-0.05982624E+03 0.01104810E+03 0.02909474E+00-0.03536307E-03    3
- 0.01998957E-06-0.04259074E-10-0.09941194E+06-0.01536396E+03                   4
-SI2CL6             40992SI  2CL  6          G  0200.00   4000.00  1500.00      1
- 0.02095456E+03 0.06904584E-02-0.03881968E-05 0.01014163E-08-0.09844696E-13    2
--0.01238540E+07-0.06426893E+03 0.01372380E+03 0.02622361E+00-0.03460508E-03    3
- 0.02024950E-06-0.04371480E-10-0.01221143E+07-0.02834094E+03                   4
-SI2F6              42489SI  2F   6          G  0200.00   3000.00  1000.00      1
- 0.01830048E+03 0.02868753E-01-0.04545577E-05-0.02497900E-08 0.06630658E-12    2
--0.02928185E+07-0.05760425E+03 0.09998134E+02 0.02170314E+00-0.03875092E-04    3
--0.01670252E-06 0.09407529E-10-0.02905483E+07-0.01422886E+03                   4
-SI2H2             111191H   2SI  2          G  0200.00   4000.00  1500.00      1
- 0.08099063E+02 0.01294220E-01-0.02447198E-05-0.01449512E-09 0.05867240E-13    2
- 0.04476428E+06-0.01877323E+03 0.09668390E+01 0.01932959E+00-0.01825422E-03    3
- 0.08404012E-07-0.01537228E-10 0.04712241E+06 0.01907609E+03                   4
-SI2H3              90589SI  2H   3          G  0200.00   2000.00  1000.00      1
- 0.07257627E+02 0.05123860E-01-0.07633465E-05-0.06662471E-08 0.02053053E-11    2
- 0.05062055E+06-0.01031413E+03 0.03335404E+02 0.02155615E+00-0.02933937E-03    3
- 0.02287785E-06-0.07272827E-10 0.05146157E+06 0.08656853E+02                   4
-SI2H5              90589SI  2H   5          G  0200.00   2000.00  1000.00      1
- 0.08451010E+02 0.09286371E-01-0.01091183E-04-0.01442367E-07 0.04250825E-11    2
- 0.02472719E+06-0.01710331E+03 0.01578848E+02 0.03549383E+00-0.04267511E-03    3
- 0.03059177E-06-0.09360425E-10 0.02630550E+06 0.01672073E+03                   4
-SI2H6              90589SI  2H   6          G  0200.00   2000.00  1000.00      1
- 0.08882090E+02 0.01151395E+00-0.01216216E-04-0.01905086E-07 0.05542379E-11    2
- 0.05967242E+05-0.02265611E+03 0.05301921E+01 0.04184056E+00-0.04685249E-03    3
- 0.03179525E-06-0.09484526E-10 0.07950598E+05 0.01880453E+03                   4
-SI3                32989SI  3               G  0200.00   4000.00  1000.00      1
- 0.07021585E+02 0.06981538E-02-0.04818729E-05 0.01720754E-08-0.01927025E-12    2
- 0.07429956E+06-0.08179233E+02 0.05312161E+02 0.05920181E-01-0.05075225E-04    3
- 0.05303866E-08 0.07031630E-11 0.07469502E+06 0.04036452E+01                   4
-SI3H8              90589SI  3H   8          G  0200.00   2000.00  1000.00      1
- 0.01342277E+03 0.01563632E+00-0.01936565E-04-0.02388330E-07 0.07120030E-11    2
- 0.09165887E+05-0.04163000E+03 0.06319791E+01 0.06412995E+00-0.07772444E-03    3
- 0.05486969E-06-0.01646097E-09 0.01209258E+06 0.02133318E+03                   4
-SI3N4(A)           42589N   4SI  3          S  0200.00   3000.00  1000.00      1
- 0.09667453E+02 0.01192721E+00-0.01709282E-04-0.01084607E-07 0.02713018E-11    2
--0.09324734E+06-0.04556492E+03 0.06631384E+02 0.02293929E+00-0.02152876E-03    3
- 0.01766237E-06-0.06632215E-10-0.09241684E+06-0.03021795E+03                   4
-SIC               112989C   1SI  1          G  0200.00   5000.00  1000.00      1
- 0.05024270E+02-0.04920894E-02 0.03109315E-05-0.06901344E-09 0.05215735E-13    2
- 0.08531026E+06-0.02478798E+02 0.02427812E+02 0.09551934E-01-0.02796633E-04    3
--0.01360012E-06 0.09196323E-10 0.08546512E+06 0.09179253E+02                   4
-SIC(B)            112989C   1SI  1          S  0200.00   4000.00  1000.00      1
- 0.03548057E+02 0.03636817E-01-0.01734873E-04 0.03912869E-08-0.03337953E-12    2
--0.01018858E+06-0.01967253E+03-0.03551396E+01 0.01599881E+00-0.01393327E-03    3
- 0.03314914E-07 0.07825957E-11-0.09294352E+05-0.01515388E+01                   4
-SIC2              112989C   2SI  1          G  0200.00   5000.00  1000.00      1
- 0.05753726E+02 0.02067546E-01-0.01132535E-04 0.03106456E-08-0.02799937E-12    2
- 0.07200461E+06-0.05294927E+02 0.03647725E+02 0.08765100E-01-0.01079869E-03    3
- 0.07974287E-07-0.02617042E-10 0.07258578E+06 0.05481050E+02                   4
-SICCH              61991H   1C   2SI  1     G  0200.00   2500.00  1500.00      1
- 0.08229114E+02 0.01220783E-01-0.01179375E-05-0.03293923E-09 0.02957217E-13    2
- 0.06029046E+06-0.01793033E+03 0.03946147E+02 0.01353938E+00-0.01476061E-03    3
- 0.08141935E-07-0.01743041E-10 0.06163490E+06 0.04400106E+02                   4
-SICH               61991H   1C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.06212049E+02 0.05590981E-02-0.07015929E-06 0.03497540E-09-0.01203199E-12    2
- 0.06044180E+06-0.08520574E+02 0.03822068E+02 0.07938745E-01-0.09707239E-04    3
- 0.05877454E-07-0.01338338E-10 0.06118631E+06 0.03835953E+02                   4
-SICH2              61991H   2C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.06246250E+02 0.02147775E-01-0.06406396E-06-0.02067218E-08 0.03841890E-12    2
- 0.03490992E+06-0.08995611E+02 0.02794283E+02 0.01138805E+00-0.01041700E-03    3
- 0.05368052E-07-0.01132779E-10 0.03606279E+06 0.09246714E+02                   4
-SICH3              61991H   3C   1SI  1     G  0200.00   2500.00  1500.00      1
- 0.06681751E+02 0.03837387E-01-0.06162348E-06-0.04678285E-08 0.09346313E-12    2
- 0.03472013E+06-0.01022379E+03 0.02444652E+02 0.01367883E+00-0.09266249E-04    3
- 0.03704818E-07-0.06763833E-11 0.03624755E+06 0.01263619E+03                   4
-SICL              121986SI  1CL  1          G  0200.00   2000.00  1000.00      1
- 0.04258460E+02 0.04020317E-02-0.02888145E-05 0.01009777E-08-0.01411012E-12    2
- 0.01775614E+06 0.04134521E+02 0.03096406E+02 0.05738623E-01-0.09740903E-04    3
- 0.07643597E-07-0.02279179E-10 0.01796795E+06 0.09603212E+02                   4
-SICL2             121986SI  1CL  2          G  0200.00   2000.00  1000.00      1
- 0.06491205E+02 0.08242384E-02-0.05767737E-05 0.01972405E-08-0.02713757E-12    2
--0.02232408E+06-0.03570531E+02 0.03826666E+02 0.01308296E+00-0.02234087E-03    3
- 0.01760742E-06-0.05267404E-10-0.02183869E+06 0.08965448E+02                   4
-SICL2H2           121986SI  1H   2CL  2     G  0200.00   2000.00  1000.00      1
- 0.07727079E+02 0.05034189E-01-0.01095746E-04-0.04419587E-08 0.01631124E-11    2
--0.04028605E+06-0.01170816E+03 0.01100209E+02 0.03262362E+00-0.04691995E-03    3
- 0.03494565E-06-0.01036285E-09-0.03892087E+06 0.02022693E+03                   4
-SICL3             121986SI  1CL  3          G  0200.00   2000.00  1000.00      1
- 0.09098097E+02 0.01405353E-01-0.09317005E-05 0.02982296E-08-0.03822011E-12    2
--0.04140193E+06-0.01455012E+03 0.04485691E+02 0.02241754E+00-0.03794196E-03    3
- 0.02973183E-06-0.08861335E-10-0.04055264E+06 0.07198771E+02                   4
-SICL3CH2CH         10891C   2CL  3H   5SI  1G  0200.00   4000.00  1500.00      1
- 0.02087242E+03 0.05492755E-01-0.06829558E-05-0.01876697E-08 0.03787112E-12    2
--0.07972510E+06-0.07741949E+03 0.04624781E+02 0.04378379E+00-0.03850522E-03    3
- 0.01844376E-06-0.03709272E-10-0.07377043E+06 0.01029869E+03                   4
-SICL3H            121986SI  1H   1CL  3     G  0200.00   2000.00  1000.00      1
- 0.09663121E+02 0.03563368E-01-0.01214911E-04-0.01609009E-09 0.05641710E-12    2
--0.06295557E+06-0.01894777E+03 0.02883770E+02 0.03308241E+00-0.05169241E-03    3
- 0.03949918E-06-0.01172104E-09-0.06163323E+06 0.01337466E+03                   4
-SICL4             121986SI  1CL  4          G  0200.00   2000.00  1000.00      1
- 0.01170938E+03 0.01972092E-01-0.01269077E-04 0.03900188E-08-0.04756468E-12    2
--0.08347808E+06-0.02791153E+03 0.05252110E+02 0.03122067E+00-0.05254593E-03    3
- 0.04102707E-06-0.01219907E-09-0.08228177E+06 0.02575727E+02                   4
-SICLH3            121986SI  1H   3CL  1     G  0200.00   2000.00  1000.00      1
- 0.05964238E+02 0.06278087E-01-0.08205635E-05-0.09280558E-08 0.02796643E-11    2
--0.01854309E+06-0.06395305E+02 0.05057173E+01 0.02703378E+00-0.03301474E-03    3
- 0.02302732E-06-0.06778703E-10-0.01730819E+06 0.02043167E+03                   4
-SIF                42489SI  1F   1          G  0200.00   3000.00  1000.00      1
- 0.04120067E+02 0.03548821E-02-0.07200222E-06-0.02190434E-09 0.06764591E-13    2
--0.07561378E+05 0.02784246E+02 0.03144948E+02 0.02588557E-01-0.05795912E-05    3
--0.01807279E-07 0.01041172E-10-0.07294439E+05 0.07876774E+02                   4
-SIF(NH2)2          22790SI  1F   1N   2H   4G  0200.00   4000.00  1000.00      1
- 0.01287944E+03 0.04598535E-01-0.04004441E-05-0.02374189E-08 0.04255211E-12    2
--0.05238279E+06-0.03653418E+03 0.07210094E+02 0.01764698E+00-0.02542060E-04    3
--0.01242214E-06 0.06989787E-10-0.05086706E+06-0.07024622E+02                   4
-SIF(NH2)3          42489SI  1N   3H   6F   1G  0200.00   3000.00  1000.00      1
- 0.01611180E+03 0.08329222E-01-0.06023787E-05-0.07470125E-08 0.01570731E-11    2
--0.09137007E+06-0.05098123E+03 0.08388268E+02 0.02746622E+00-0.04455675E-04    3
--0.01955733E-06 0.01140721E-09-0.08947806E+06-0.01138178E+03                   4
-SIF2               42489SI  1F   2          G  0200.00   3000.00  1000.00      1
- 0.06142470E+02 0.07807974E-02-0.01339312E-05-0.06264839E-09 0.01725138E-12    2
--0.07744042E+06-0.04712327E+02 0.03845345E+02 0.06038465E-01-0.01167732E-04    3
--0.04579554E-07 0.02607414E-10-0.07681634E+06 0.07272984E+02                   4
-SIF2(NH2)2         42489SI  1N   2H   4F   2G  0200.00   3000.00  1000.00      1
- 0.01441477E+03 0.06110646E-01-0.04871145E-05-0.05455935E-08 0.01172714E-11    2
--0.01292757E+07-0.04308682E+03 0.07634268E+02 0.02315843E+00-0.04193827E-04    3
--0.01715351E-06 0.01016462E-09-0.01276410E+07-0.08419031E+02                   4
-SIF2N              42489SI  1N   1F   2     G  0200.00   3000.00  1000.00      1
- 0.08687337E+02 0.01193488E-01-0.01992661E-05-0.09951334E-09 0.02704383E-12    2
--0.03463832E+06-0.01494053E+03 0.05102583E+02 0.09456606E-01-0.01819383E-04    3
--0.07309616E-07 0.04178902E-10-0.03367294E+06 0.03734424E+02                   4
-SIF2NH2            42489SI  1N   1F   2H   2G  0200.00   3000.00  1000.00      1
- 0.09872415E+02 0.03722112E-01-0.03271338E-05-0.03321674E-08 0.07293692E-12    2
--0.08751628E+06-0.01899096E+03 0.05890444E+02 0.01285128E+00-0.01863556E-04    3
--0.08718963E-07 0.04848951E-10-0.08644527E+06 0.01756163E+02                   4
-SIF3               42489SI  1F   3          G  0200.00   3000.00  1000.00      1
- 0.08524790E+02 0.01323792E-01-0.02104279E-05-0.01149504E-08 0.03055301E-12    2
--0.01223522E+07-0.01550234E+03 0.04662868E+02 0.01008788E+00-0.01805544E-04    3
--0.07769299E-07 0.04377852E-10-0.01212965E+07 0.04672966E+02                   4
-SIF3NH             42489SI  1N   1F   3H   1G  0200.00   3000.00  1000.00      1
- 0.01163766E+03 0.02880769E-01-0.03357310E-05-0.02584594E-08 0.06162371E-12    2
--0.01295891E+07-0.02590718E+03 0.06013822E+02 0.01597729E+00-0.02791466E-04    3
--0.01214120E-06 0.06927415E-10-0.01280974E+07 0.03316771E+02                   4
-SIF3NH2            42489SI  1N   1F   3H   2G  0200.00   3000.00  1000.00      1
- 0.01210964E+03 0.04383282E-01-0.04142245E-05-0.03989090E-08 0.08958954E-12    2
--0.01641768E+07-0.03046928E+03 0.06229403E+02 0.01778015E+00-0.02612304E-04    3
--0.01267243E-06 0.07044556E-10-0.01625849E+07 0.02045441E+01                   4
-SIF3NHSIH3         42489SI  2N   1H   4F   3G  0200.00   3000.00  1000.00      1
- 0.01669941E+03 0.07789785E-01-0.08110570E-05-0.07650199E-08 0.01773956E-11    2
--0.01673412E+07-0.05080007E+03 0.06216046E+02 0.02939330E+00-0.02717745E-04    3
--0.01982878E-06 0.01002768E-09-0.01642282E+07 0.04858261E+02                   4
-SIF3NSIH3          42489SI  2N   1H   3F   3G  0200.00   3000.00  1000.00      1
- 0.01599146E+03 0.06371086E-01-0.07256824E-05-0.06292690E-08 0.01495157E-11    2
--0.01331158E+07-0.04495265E+03 0.06404372E+02 0.02601982E+00-0.02491543E-04    3
--0.01769542E-06 0.08919883E-10-0.01302520E+07 0.06002945E+02                   4
-SIF4               41389F   4SI  1          G  0200.00   2000.00  1000.00      1
- 0.09985301E+02 0.03532637E-01-0.01197378E-04-0.01036549E-08 0.08661585E-12    2
--0.01977200E+07-0.02472644E+03 0.02147416E+02 0.03402219E+00-0.04756874E-03    3
- 0.03252196E-06-0.08819304E-10-0.01960449E+07 0.01346315E+03                   4
-SIFH3              42489SI  1F   1H   3     G  0200.00   3000.00  1000.00      1
- 0.06799678E+02 0.04747086E-01-0.04767067E-05-0.04814665E-08 0.01107761E-11    2
--0.04577024E+06-0.01261433E+03 0.02032190E+02 0.01341363E+00-0.02806381E-05    3
--0.07803291E-07 0.03337474E-10-0.04421627E+06 0.01318768E+03                   4
-SIFNH              42489SI  1N   1F   1H   1G  0200.00   3000.00  1000.00      1
- 0.07163299E+02 0.01521325E-01-0.01536337E-05-0.01195933E-08 0.02684100E-12    2
--0.09065496E+05-0.06764144E+02 0.05390691E+02 0.06071319E-01-0.01359490E-04    3
--0.04267435E-07 0.02603154E-10-0.08644237E+05 0.02272065E+02                   4
-SIFNH2             22790F   1SI  1N   1H   2G  0200.00   4000.00  1000.00      1
- 0.08017582E+02 0.03209103E-01-0.03361364E-05-0.01796537E-08 0.03385552E-12    2
--0.04313426E+06-0.01487024E+03 0.04214050E+02 0.01105423E+00-0.01014725E-04    3
--0.07143728E-07 0.03634923E-10-0.04200629E+06 0.05318890E+02                   4
-SIH               121986SI  1H   1          G  0200.00   2000.00  1000.00      1
- 0.03110430E+02 0.01094946E-01 0.02898629E-06-0.02745104E-08 0.07051799E-12    2
- 0.04516898E+06 0.04193487E+02 0.03836010E+02-0.02702657E-01 0.06849070E-04    3
--0.05424184E-07 0.01472131E-10 0.04507593E+06 0.09350778E+01                   4
-SIH2               42489SI  1H   2          G  0200.00   3000.00  1000.00      1
- 0.04142390E+02 0.02150191E-01-0.02190730E-05-0.02073725E-08 0.04741018E-12    2
- 0.03110484E+06 0.02930745E+01 0.03475092E+02 0.02139338E-01 0.07672306E-05    3
- 0.05217668E-08-0.09898824E-11 0.03147397E+06 0.04436585E+02                   4
-SIH2CL            121986SI  1H   2CL  1     G  0200.00   2000.00  1000.00      1
- 0.05555902E+02 0.04046479E-01-0.06581751E-05-0.05027548E-08 0.01599110E-11    2
- 0.01912428E+05-0.01906890E+02 0.01699256E+02 0.01961407E+00-0.02622973E-03    3
- 0.01936417E-06-0.05846399E-10 0.02743662E+05 0.01683133E+03                   4
-SIH2F              42489SI  1F   1H   2     G  0200.00   3000.00  1000.00      1
- 0.06020399E+02 0.03074040E-01-0.03248887E-05-0.03052243E-08 0.07098090E-12    2
--0.02347670E+06-0.05919595E+02 0.02782566E+02 0.09148257E-01-0.04186788E-05    3
--0.05388971E-07 0.02412133E-10-0.02244201E+06 0.01152854E+03                   4
-SIH2F2             42489SI  1H   2F   2     G  0200.00   3000.00  1000.00      1
- 0.07997762E+02 0.03911538E-01-0.04222679E-05-0.03913812E-08 0.09171569E-12    2
--0.09682880E+06-0.01622400E+03 0.02701455E+02 0.01456545E+00-0.01163300E-04    3
--0.09685830E-07 0.04769591E-10-0.09522440E+06 0.01200689E+03                   4
-SIH3               42489SI  1H   3          G  0200.00   3000.00  1000.00      1
- 0.05015906E+02 0.03732750E-01-0.03609053E-05-0.03729193E-08 0.08468490E-12    2
- 0.02190233E+06-0.04291368E+02 0.02946733E+02 0.06466764E-01 0.05991653E-05    3
--0.02218413E-07 0.03052670E-11 0.02270173E+06 0.07347948E+02                   4
-SIH3NH2            42489SI  1N   1H   5     G  0200.00   3000.00  1000.00      1
- 0.08109945E+02 0.07215753E-01-0.06052251E-05-0.07086088E-08 0.01557864E-11    2
--0.08999782E+05-0.01651650E+03 0.02936348E+02 0.01674704E+00-0.03232859E-05    3
--0.09171970E-07 0.03979516E-10-0.07334716E+05 0.01141437E+03                   4
-SIH3NHSIH3         42489SI  2N   1H   7     G  0200.00   3000.00  1000.00      1
- 0.01265296E+03 0.01066748E+00-0.01007336E-04-0.01081222E-07 0.02452364E-11    2
--0.01249721E+06-0.03441428E+03 0.02468750E+02 0.02940255E+00-0.06248179E-05    3
--0.01731462E-06 0.07545261E-10-0.09209690E+05 0.02059560E+03                   4
-SIH3NSIH3          42489SI  2N   1H   6     G  0200.00   3000.00  1000.00      1
- 0.01201462E+03 0.09187517E-01-0.09159516E-05-0.09380967E-08 0.02156435E-11    2
- 0.01965066E+06-0.02978186E+03 0.02827574E+02 0.02580647E+00-0.04200478E-05    3
--0.01503859E-06 0.06388325E-10 0.02265351E+06 0.01997012E+03                   4
-SIH3SIH2CH3       111391H   8C   1SI  2     G  0200.00   4000.00  1500.00      1
- 0.01886736E+03 0.06449996E-01-0.06896411E-05-0.02584789E-08 0.04830521E-12    2
--0.06620909E+05-0.07374424E+03 0.02132164E+02 0.04348657E+00-0.03495608E-03    3
- 0.01588231E-06-0.03150773E-10-0.02040937E+04 0.01752930E+03                   4
-SIH4              121386SI  1H   4          G  0200.00   4000.00  1000.00      1
- 0.06893874E+02 0.04030501E-01-0.04183314E-05-0.02291395E-08 0.04384766E-12    2
- 0.01107037E+05-0.01749117E+03 0.02475167E+02 0.09003721E-01 0.02185394E-04    3
--0.02681423E-07-0.06621081E-11 0.02925488E+05 0.07751015E+02                   4
-SIHCL2            121986SI  1H   1CL  2     G  0200.00   2000.00  1000.00      1
- 0.07229734E+02 0.02869206E-01-0.08849876E-05-0.07495866E-09 0.05752338E-12    2
--0.01971399E+06-0.07052663E+02 0.02368353E+02 0.02401088E+00-0.03717220E-03    3
- 0.02851998E-06-0.08530494E-10-0.01875884E+06 0.01614587E+03                   4
-SIHF               42489SI  1F   1H   1     G  0200.00   3000.00  1000.00      1
- 0.05073509E+02 0.01533279E-01-0.01840659E-05-0.01440038E-08 0.03452517E-12    2
--0.01973880E+06-0.01079507E+02 0.03223728E+02 0.04981221E-01-0.03173051E-05    3
--0.02822231E-07 0.01247832E-10-0.01914168E+06 0.08906423E+02                   4
-SIHF2              42489SI  1H   1F   2     G  0200.00   3000.00  1000.00      1
- 0.07216536E+02 0.02253240E-01-0.02737472E-05-0.02173460E-08 0.05255331E-12    2
--0.07280241E+06-0.09783487E+02 0.03377237E+02 0.01036607E+00-0.01239082E-04    3
--0.07267982E-07 0.03794989E-10-0.07168358E+06 0.01052189E+03                   4
-SIHF3              42489SI  1H   1F   3     G  0200.00   3000.00  1000.00      1
- 0.09363567E+02 0.02947556E-01-0.03577633E-05-0.02858224E-08 0.06915729E-12    2
--0.01486074E+07-0.02169453E+03 0.03918053E+02 0.01463917E+00-0.01856070E-04    3
--0.01058200E-06 0.05617543E-10-0.01470439E+07 0.07024261E+02                   4
-SIN                42489SI  1N   1          G  0200.00   3000.00  1000.00      1
- 0.04122909E+02 0.03521458E-02-0.07161081E-06-0.02154956E-09 0.06667571E-13    2
- 0.05683927E+06 0.02389838E+02 0.03149182E+02 0.02584376E-01-0.05804625E-05    3
--0.01805627E-07 0.01041095E-10 0.05710564E+06 0.07474389E+02                   4
-SINH               42489SI  1N   1H   1     G  0200.00   3000.00  1000.00      1
- 0.04928801E+02 0.01628624E-01-0.01367197E-05-0.01390460E-08 0.02998969E-12    2
- 0.01767790E+06-0.02823472E+02 0.03166975E+02 0.05805823E-01-0.09524443E-05    3
--0.03991893E-07 0.02283188E-10 0.01813561E+06 0.06298440E+02                   4
-SINH2              42489SI  1N   1H   2     G  0200.00   3000.00  1000.00      1
- 0.05186436E+02 0.03016656E-01-0.02165476E-05-0.02722658E-08 0.05706182E-12    2
- 0.02270508E+06-0.01242140E+02 0.03362770E+02 0.07261176E-01-0.08721233E-05    3
--0.04400014E-07 0.02419532E-10 0.02318446E+06 0.08223867E+02                   4
-SN                121286S   1N   1          G  0200.00   5000.00  1000.00      1
- 0.03888287E+02 0.06778427E-02-0.02725309E-05 0.05135927E-09-0.03593836E-13    2
- 0.03044496E+06 0.04194291E+02 0.03407346E+02 0.01797887E-01-0.02018970E-04    3
- 0.02107857E-07-0.09527592E-11 0.03062373E+06 0.06821481E+02                   4
-SO                121286S   1O   1          G  0200.00   5000.00  1000.00      1
- 0.04021078E+02 0.02584856E-02 0.08948142E-06-0.03580145E-09 0.03228430E-13    2
--0.07119620E+04 0.03452523E+02 0.03080401E+02 0.01803106E-01 0.06705022E-05    3
--0.02069005E-07 0.08514657E-11-0.03986163E+04 0.08581028E+02                   4
-SO2               121286S   1O   2          G  0200.00   5000.00  1000.00      1
- 0.05254498E+02 0.01978545E-01-0.08204226E-05 0.01576383E-08-0.01120451E-12    2
--0.03756886E+06-0.01146056E+02 0.02911439E+02 0.08103022E-01-0.06906710E-04    3
- 0.03329016E-07-0.08777121E-11-0.03687882E+06 0.01111740E+03                   4
-SO3               121286S   1O   3          G  0200.00   5000.00  1000.00      1
- 0.07050668E+02 0.03246560E-01-0.01408897E-04 0.02721535E-08-0.01942365E-12    2
--0.05020668E+06-0.01106443E+03 0.02575283E+02 0.01515092E+00-0.01229872E-03    3
- 0.04240257E-07-0.05266812E-11-0.04894411E+06 0.01219512E+03                   4
-CH2*              L S/93C   1H   2   00   00G   200.000  3500.000  1000.000    1
- 2.29203842E+00 4.65588637E-03-2.01191947E-06 4.17906000E-10-3.39716365E-14    2
- 5.09259997E+04 8.62650169E+00 4.19860411E+00-2.36661419E-03 8.23296220E-06    3
--6.68815981E-09 1.94314737E-12 5.04968163E+04-7.69118967E-01 9.93967200E+03    4
-C2H3O             T04/83O   1H   3C   2    0G   200.000  5000.000              1
- 0.59756699E+01 0.81305914E-02-0.27436245E-05 0.40703041E-09-0.21760171E-13    2
- 0.49032178E+03-0.50320879E+01 0.34090624E+01 0.10738574E-01 0.18914925E-05    3
- 0.71585831E-08 0.28673851E-11 0.15214766E+04 0.95714535E+01 0.30474436E+04    4
-PC3H4              40687C   3H   4          G  0200.00   5000.00  1000.00      1
- 0.05511034E+02 0.01246956E+00-0.04814165E-04 0.08573769E-08-0.05771561E-12    2
- 0.01961967E+06-0.01079475E+03 0.06271447E+01 0.03116179E+00-0.03747664E-03    3
- 0.02964118E-06-0.09987382E-10 0.02083493E+06 0.01346880E+03                   4
-n-C4H3            HW /94C   4H   3    0    0G   200.000  3000.000              1
- 0.54328279E+01 0.16860981E-01-0.94313109E-05 0.25703895E-08-0.27456309E-12    2
- 0.61600680E+05-0.15673981E+01-0.31684113E+00 0.46912100E-01-0.68093810E-04    3
- 0.53179921E-07-0.16523005E-10 0.62476199E+05 0.24622559E+02                   4
-i-C4H3            AB1/93C   4H   3    0    0G   200.000  3000.000              1
- 0.90978165E+01 0.92207119E-02-0.33878441E-05 0.49160498E-09-0.14529780E-13    2
- 0.56600574E+05-0.19802597E+02 0.20830412E+01 0.40834274E-01-0.62159685E-04    3
- 0.51679358E-07-0.17029184E-10 0.58005129E+05 0.13617462E+02                   4
-n-C4H5            HW /94C   4H   5    0    0G   200.000  3000.000              1
- 0.98501978E+01 0.10779008E-01-0.13672125E-05-0.77200535E-09 0.18366314E-12    2
- 0.38840301E+05-0.26001846E+02 0.16305321E+00 0.39830137E-01-0.34000128E-04    3
- 0.15147233E-07-0.24665825E-11 0.41429766E+05 0.23536163E+02                   4
-i-C4H5            HW /94C   4H   5    0    0G   200.000  3000.000              1
- 0.10229092E+02 0.94850138E-02-0.90406445E-07-0.12596100E-08 0.24781468E-12    2
- 0.34642812E+05-0.28564529E+02-0.19932900E-01 0.38005672E-01-0.27559450E-04    3
- 0.77835551E-08 0.40209383E-12 0.37496223E+05 0.24394241E+02                   4
-C4H612            A 8/83C   4H   6    0    0G   200.     3000.     1000.0      1
-  0.1781557E 02 -0.4257502E-02  0.1051185E-04 -0.4473844E-08  0.5848138E-12    2
-  0.1267342E 05 -0.6982662E 02  0.1023467E 01  0.3495919E-01 -0.2200905E-04    3
-  0.6942272E-08 -0.7879187E-12  0.1811799E 05  0.1975066E 02  0.1950807E+05    4
-A1                HW /94C   6H   6    0    0G   200.000  3000.000              1
- 0.17246994E+02 0.38420164E-02 0.82776232E-05-0.48961120E-08 0.76064545E-12    2
- 0.26646055E+04-0.71945175E+02-0.48998680E+01 0.59806932E-01-0.36710087E-04    3
- 0.32740399E-08 0.37600886E-11 0.91824570E+04 0.44095642E+02                   4
-C5H3               20387C   5H   3          G  0200.00   5000.00  1000.00      1
- 0.01078762E+03 0.09539619E-01-0.03206745E-04 0.04733323E-08-0.02512135E-12    2
- 0.06392904E+06-0.03005444E+03 0.04328720E+02 0.02352480E+00-0.05856723E-04    3
--0.01215449E-06 0.07726478E-10 0.06588531E+06 0.04173259E+02                   4
-l-C6H4            HW /94C   6H   4    0    0G   200.000  3000.000              1
- 0.12715182E+02 0.13839662E-01-0.43765440E-05 0.31541636E-09 0.46619026E-13    2
- 0.57031148E+05-0.39464600E+02 0.29590225E+00 0.58053318E-01-0.67766756E-04    3
- 0.43376762E-07-0.11418864E-10 0.60001371E+05 0.22318970E+02                   4
-n-C6H5            HW /94C   6H   5    0    0G   200.000  3000.000              1
- 0.16070068E+02 0.81899539E-02 0.17325165E-05-0.20624185E-08 0.36292345E-12    2
- 0.64616867E+05-0.56163742E+02-0.61135769E+00 0.65082610E-01-0.78262397E-04    3
- 0.53030828E-07-0.14946683E-10 0.68805375E+05 0.27635468E+02                   4
-A1-               HW /94C   6H   5    0    0G   200.000  3000.000              1
- 0.14493439E+02 0.75712688E-02 0.37894542E-05-0.30769500E-08 0.51347820E-12    2
- 0.33189977E+05-0.54288940E+02-0.49076147E+01 0.59790771E-01-0.45639827E-04    3
- 0.14964993E-07-0.91767826E-12 0.38733410E+05 0.46567780E+02                   4
-c-C6H4            HW /94C   6H   4    0    0G   200.000  3000.000              1
- 0.13849209E+02 0.78807920E-02 0.18243836E-05-0.21169166E-08 0.37459977E-12    2
- 0.47446340E+05-0.50404953E+02-0.30991268E+01 0.54030564E-01-0.40839004E-04    3
- 0.10738837E-07 0.98078490E-12 0.52205711E+05 0.37415207E+02                   4
-l-C6H6            HW /94C   6H   6    0    0G   200.000  3000.000              1
- 0.10874918E+02 0.23293324E-01-0.94495535E-05 0.16255329E-08-0.84771200E-13    2
- 0.36224055E+05-0.30326756E+02 0.59114441E-01 0.55723339E-01-0.43485274E-04    3
- 0.14487391E-07-0.52512541E-12 0.39042688E+05 0.24796795E+02                   4
-n-C6H7            HW /94C   6H   7    0    0G   200.000  3000.000              1
- 0.22577469E+02-0.30737517E-02 0.14225234E-04-0.69880848E-08 0.10232874E-11    2
- 0.41228980E+05-0.91568619E+02 0.13248032E+00 0.57103366E-01-0.43712644E-04    3
- 0.15538603E-07-0.12976356E-11 0.47730512E+05 0.25339081E+02                   4
-c-C6H7            HW /94C   6H   7    0    0G   200.000  3000.000              1
- 0.19996841E+02 0.11189543E-02 0.11649756E-04-0.62779471E-08 0.94939508E-12    2
- 0.16730059E+05-0.83746933E+02-0.30328493E+01 0.50804518E-01-0.69150292E-05    3
--0.29715974E-07 0.16296353E-10 0.23895383E+05 0.38909180E+02                   4
-C6H8              HW /94C   6H   8    0    0G   200.000  3000.000              1
- 0.28481979E+02-0.15702948E-01 0.26771697E-04-0.11780109E-07 0.16573427E-11    2
- 0.93346445E+04-0.12500226E+03 0.15850439E+01 0.40215142E-01 0.78439543E-05    3
--0.38761325E-07 0.18545207E-10 0.17949613E+05 0.19112625E+02                   4
-i-C6H5            HW /94C   6H   5    0    0G   200.000  3000.000              1
- 0.22501663E+02-0.81009977E-02 0.15955695E-04-0.72310371E-08 0.10310424E-11    2
- 0.58473410E+05-0.91224777E+02-0.78585434E+00 0.60221825E-01-0.62890264E-04    3
- 0.36310730E-07-0.87000259E-11 0.64942270E+05 0.28658905E+02                   4
-i-C6H7            HW /94C   6H   7    0    0G   200.000  3000.000              1
- 0.20481506E+02 0.79439697E-03 0.11450761E-04-0.60991177E-08 0.91756724E-12    2
- 0.37728426E+05-0.81812073E+02-0.17099094E+01 0.62486034E-01-0.54290707E-04    3
- 0.26959682E-07-0.58999090E-11 0.44086621E+05 0.33344772E+02                   4
-A1C2H             HW /94C   8H   6    0    0G   200.000  3000.000              1
- 0.24090759E+02 0.78232400E-03 0.11453964E-04-0.61620504E-08 0.93346685E-12    2
- 0.27429445E+05-0.10499631E+03-0.52645016E+01 0.84511042E-01-0.76597848E-04    3
- 0.33216978E-07-0.47673063E-11 0.35566242E+05 0.46378815E+02                   4
-A1C2H-            HW /94C   8H   5    0    0G   200.000  3000.000              1
- 0.12359501E+02 0.25453357E-01-0.10606554E-04 0.18914603E-08-0.10630622E-12    2
- 0.60930461E+05-0.40900208E+02-0.44495859E+01 0.76995067E-01-0.66617038E-04    3
- 0.25038682E-07-0.19756601E-11 0.65225926E+05 0.44427948E+02                   4
-n-A1C2H2          HW /94C   8H   7    0    0G   200.000  3000.000              1
- 0.30433151E+02-0.13965182E-01 0.25416972E-04-0.11354174E-07 0.16092050E-11    2
- 0.35738719E+05-0.13416492E+03-0.44899931E+01 0.78750789E-01-0.62376959E-04    3
- 0.21952140E-07-0.16960955E-11 0.45902949E+05 0.47980759E+02                   4
-i-A1C2H2          HW /94C   8H   7    0    0G   200.000  3000.000              1
- 0.24365524E+02 0.11262144E-02 0.12931670E-04-0.69641146E-08 0.10540145E-11    2
- 0.33549121E+05-0.10462067E+03-0.25971584E+01 0.63454390E-01-0.20852312E-04    3
--0.22604624E-07 0.15112869E-10 0.41707375E+05 0.37893417E+02                   4
-A1C2H*            HW /94C   8H   5    0    0G   200.000  3000.000              1
- 0.28686157E+02-0.13869863E-01 0.22721186E-04-0.99882271E-08 0.14085851E-11    2
- 0.56047309E+05-0.12750334E+03-0.29324217E+01 0.66043675E-01-0.39500475E-04    3
--0.31830381E-08 0.85300387E-11 0.65324043E+05 0.38058685E+02                   4
-A1C2H3            HW /94C   8H   8    0    0G   200.000  3000.000              1
- 0.11303213E+02 0.33709887E-01-0.13208885E-04 0.21140962E-08-0.87311377E-13    2
- 0.11725388E+05-0.34737919E+02-0.38678493E+01 0.67947865E-01-0.25230333E-04    3
--0.18017145E-07 0.12998470E-10 0.16200269E+05 0.45271770E+02                   4
-A1C2H3*           HW /94C   8H   7    0    0G   200.000  3000.000              1
- 0.11563599E+02 0.30210810E-01-0.11545593E-04 0.17302320E-08-0.52379765E-13    2
- 0.40498492E+05-0.34882965E+02-0.38868685E+01 0.68168961E-01-0.34805875E-04    3
--0.56410254E-08 0.80714758E-11 0.44941359E+05 0.45943188E+02                   4
-A1C2HC2H2         HW /94C  10H   7    0    0G   200.000  3000.000              1
- 0.37523422E+02-0.17028838E-01 0.28777416E-04-0.12719674E-07 0.17976818E-11    2
- 0.61041488E+05-0.17188731E+03-0.63184557E+01 0.11657917E+00-0.13638573E-03    3
- 0.88823526E-07-0.24348468E-10 0.72977062E+05 0.52624207E+02                   4
-A1C2H)2           HW /94C  10H   6    0    0G   200.000  3000.000              1
- 0.39766785E+02-0.24939798E-01 0.34210185E-04-0.14473258E-07 0.20104023E-11    2
- 0.50136750E+05-0.18657632E+03-0.75570364E+01 0.12159592E+00-0.15138849E-03    3
- 0.10287488E-06-0.28950911E-10 0.62914168E+05 0.55213287E+02                   4
-A2-1              HW /94C  10H   7    0    0G   200.000  3000.000              1
- 0.38380905E+02-0.23157451E-01 0.35479272E-04-0.15395457E-07 0.21609069E-11    2
- 0.32698469E+05-0.18106512E+03-0.85287294E+01 0.10334599E+00-0.91922702E-04    3
- 0.43147448E-07-0.85738135E-11 0.46335004E+05 0.63342224E+02                   4
-A2-2              HW /94C  10H   7    0    0G   200.000  3000.000              1
- 0.37326401E+02-0.20478070E-01 0.33183067E-04-0.14576987E-07 0.20569137E-11    2
- 0.32840301E+05-0.17537704E+03-0.38448524E+01 0.70514679E-01-0.93748040E-05    3
--0.44051607E-07 0.24267865E-10 0.45627656E+05 0.43582001E+02                   4
-A2                HW /94C  10H   8    0    0G   200.000  3000.000              1
- 0.36468643E+02-0.15419513E-01 0.30160038E-04-0.13700120E-07 0.19582730E-11    2
- 0.35091445E+04-0.17329489E+03-0.94505043E+01 0.11137849E+00-0.10345667E-03    3
- 0.52800392E-07-0.11804439E-10 0.16695594E+05 0.65187668E+02                   4
-naphthyne         HW /94C  10H   6    0    0G   200.000  3000.000              1
- 0.37680222E+02-0.23843173E-01 0.34590019E-04-0.14841252E-07 0.20744023E-11    2
- 0.45771934E+05-0.17676088E+03-0.68131294E+01 0.96868336E-01-0.87982247E-04    3
- 0.41858918E-07-0.82716637E-11 0.58661090E+05 0.54849548E+02                   4
-A2C2H2            HW /94C  12H   9    0    0G   200.000  3000.000              1
- 0.38449295E+02-0.62794946E-02 0.24404828E-04-0.11968822E-07 0.17586878E-11    2
- 0.41090176E+05-0.17668623E+03-0.78516331E+01 0.12104863E+00-0.10531662E-03    3
- 0.46280483E-07-0.77963885E-11 0.54316234E+05 0.63654388E+02                   4
-A2C2HA            HW /94C  12H   8    0    0G   200.000  3000.000              1
- 0.49453674E+02-0.33857111E-01 0.46505607E-04-0.19681195E-07 0.27340769E-11    2
- 0.26851051E+05-0.23933099E+03-0.11530450E+02 0.14741433E+00-0.17302344E-03    3
- 0.11500390E-06-0.32709183E-10 0.43793129E+05 0.74391754E+02                   4
-A2C2HB            HW /94C  12H   8    0    0G   200.000  3000.000              1
- 0.18184774E+02 0.41343965E-01-0.17302822E-04 0.31004770E-08-0.17580817E-12    2
- 0.36171543E+05-0.73466003E+02-0.68233256E+01 0.11382083E+00-0.88584900E-04    3
- 0.25930856E-07 0.80712824E-12 0.42797719E+05 0.54592098E+02                   4
-A2C2HA*           HW /94C  12H   7    0    0G   200.000  3000.000              1
- 0.36614349E+02-0.60314685E-02 0.21614964E-04-0.10579910E-07 0.15563124E-11    2
- 0.60723898E+05-0.17026691E+03-0.84175968E+01 0.12391680E+00-0.12250672E-03    3
- 0.64071344E-07-0.13889583E-10 0.73248562E+05 0.61893204E+02                   4
-A2C2HB*           HW /94C  12H   7    0    0G   200.000  3000.000              1
- 0.44933517E+02-0.26026871E-01 0.38589074E-04-0.16646357E-07 0.23321310E-11    2
- 0.57926637E+05-0.21417279E+03-0.11824737E+02 0.14904183E+00-0.18618468E-03    3
- 0.13129460E-06-0.39145326E-10 0.73385375E+05 0.76273834E+02                   4
-A2C2H)2           HW /94C  14H   8    0    0G   200.000  3000.000              1
- 0.23671062E+02 0.42137049E-01-0.17596645E-04 0.31081251E-08-0.16805216E-12    2
- 0.77926273E+05-0.99615448E+02-0.63029008E+01 0.13745695E+00-0.13055481E-03    3
- 0.60730663E-07-0.10178345E-10 0.85489430E+05 0.51891548E+02                   4
-A2HR5             HW /94C  12H   9    0    0G   200.000  3000.000              1
- 0.51227890E+02-0.36250230E-01 0.50296483E-04-0.21346413E-07 0.29698119E-11    2
- 0.32111648E+05-0.25061665E+03-0.92796507E+01 0.11707741E+00-0.78334211E-04    3
- 0.10778407E-07 0.66555260E-11 0.50063973E+05 0.66712509E+02                   4
-A2R5              HW /94C  12H   8    0    0G   200.000  3000.000              1
- 0.45883698E+02-0.27226903E-01 0.41569336E-04-0.18047093E-07 0.25351396E-11    2
- 0.13394574E+05-0.22304584E+03-0.97011614E+01 0.12019449E+00-0.98907694E-04    3
- 0.37240884E-07-0.41124578E-11 0.29601926E+05 0.66970596E+02                   4
-A3-4              HW /94C  14H   9    0    0G   200.000  3000.000              1
- 0.55788879E+02-0.37930615E-01 0.53528085E-04-0.22830790E-07 0.31841231E-11    2
- 0.32605633E+05-0.27378882E+03-0.11266616E+02 0.14216852E+00-0.12632679E-03    3
- 0.58348800E-07-0.11184283E-10 0.52141961E+05 0.75774780E+02                   4
-A3-1              HW /94C  14H   9    0    0G   200.000  3000.000              1
- 0.51812469E+02-0.28380312E-01 0.45409150E-04-0.19924162E-07 0.28118107E-11    2
- 0.34357359E+05-0.25257889E+03-0.73971558E+01 0.11464679E+00-0.57456185E-04    3
--0.14070547E-07 0.16005933E-10 0.52239715E+05 0.59582397E+02                   4
-A3                HW /94C  14H  10    0    0G   200.000  3000.000              1
- 0.55916473E+02-0.35253201E-01 0.52522926E-04-0.22672634E-07 0.31770584E-11    2
- 0.32654609E+04-0.27604980E+03-0.12275226E+02 0.15032256E+00-0.13862801E-03    3
- 0.69376767E-07-0.15105445E-10 0.23030492E+05 0.78889145E+02                   4
-A3C2H2            HW /94C  16H  11    0    0G   200.000  3000.000              1
- 0.47582428E+02-0.12822752E-02 0.25647692E-04-0.13378838E-07 0.20086545E-11    2
- 0.46191215E+05-0.22653258E+03-0.95893555E+01 0.15080631E+00-0.11617327E-03    3
- 0.36814228E-07-0.12802901E-11 0.62701906E+05 0.71309311E+02                   4
-A3C2H             HW /94C  16H  10    0    0G   200.000  3000.000              1
- 0.52165146E+02-0.13197318E-01 0.34353056E-04-0.16283892E-07 0.23677362E-11    2
- 0.34235055E+05-0.25406651E+03-0.11602674E+02 0.16824394E+00-0.16432030E-03    3
- 0.86394380E-07-0.19310567E-10 0.52172836E+05 0.75515366E+02                   4
-A4H               HW /94C  16H  11    0    0G   200.000  3000.000              1
- 0.53775238E+02-0.15681151E-01 0.38488797E-04-0.18134241E-07 0.26325071E-11    2
- 0.24154484E+05-0.26532764E+03-0.12209255E+02 0.15599608E+00-0.11474930E-03    3
- 0.30214796E-07 0.18287498E-11 0.43453211E+05 0.79503540E+02                   4
-A4                HW /94C  16H  10    0    0G   200.000  3000.000              1
- 0.58017273E+02-0.29164989E-01 0.48728383E-04-0.21593682E-07 0.30609786E-11    2
- 0.43451016E+04-0.29017163E+03-0.13759249E+02 0.16772294E+00-0.15500121E-03    3
- 0.75759544E-07-0.15674045E-10 0.24996187E+05 0.82853027E+02                   4
-A4-               HW /94C  16H   9    0    0G   200.000  3000.000              1
- 0.22088816E+02 0.53355407E-01-0.22329932E-04 0.39479620E-08-0.21313176E-12    2
- 0.45200934E+05-0.96724930E+02-0.96258593E+01 0.13385314E+00-0.77600773E-04    3
--0.36330547E-08 0.13855670E-10 0.54171852E+05 0.68499725E+02                   4
-P2                HW /94C  12H  10    0    0G   200.000  3000.000              1
- 0.50761871E+02-0.34501564E-01 0.50293413E-04-0.21559579E-07 0.30097192E-11    2
- 0.21538867E+04-0.24670712E+03-0.10283234E+02 0.12428707E+00-0.95990268E-04    3
- 0.32294793E-07-0.23045229E-11 0.20165258E+05 0.72707947E+02                   4
-P2-               HW /94C  12H   9    0    0G   200.000  3000.000              1
- 0.44711853E+02-0.22851825E-01 0.39102117E-04-0.17352100E-07 0.24579375E-11    2
- 0.33714000E+05-0.21220692E+03-0.11851097E+02 0.13545156E+00-0.13310938E-03    3
- 0.73769911E-07-0.18193003E-10 0.49878781E+05 0.81107361E+02                   4
-P2-H              HW /94C  12H  11    0    0G   200.000  3000.000              1
- 0.41542511E+02-0.83502531E-02 0.29097937E-04-0.14148299E-07 0.20728341E-11    2
- 0.22772937E+05-0.19578616E+03-0.99978790E+01 0.12279570E+00-0.80112615E-04    3
- 0.11102152E-07 0.64273890E-11 0.37960410E+05 0.74195984E+02                   4
-C5H4OH            L 8/89C   5H   5O   1    0G   200.000  6000.000              1
- 0.13367912d+02 0.15205785d-01-0.54592258d-05 0.88134866d-09-0.52774454d-13    2
- 0.38411506d+04-0.45920839d+02-0.12822236d+01 0.49041160d-01-0.13688997d-04    3
--0.29133858d-07 0.19006964d-10 0.80087098d+04 0.30798358d+02 0.96365992d+04    4
-C5H5O             L 7/89C   5O   1H   5    0G   200.000  6000.000              1
- 0.12606422d+02 0.16747260d-01-0.61098574d-05 0.99676557d-09-0.60113201d-13    2
- 0.39313455d+04-0.42604277d+02 0.23042835d+00 0.32322691d-01 0.28900443d-04    3
--0.70679977d-07 0.33406891d-10 0.80753082d+04 0.25330974d+02                   4
-C5H4O             P 1/93C   5H   4O   1    0G   200.000  3000.000              1
- 0.47927242E+01 0.29221680E-01-0.15997486E-04 0.42069049E-08-0.42815179E-12    2
- 0.22849286E+04-0.30131893E+01-0.23915355E+01 0.47363680E-01-0.30728171E-04    3
- 0.78031552E-08-0.25145729E-12 0.43740152E+04 0.34594337E+02                   4
-C7H16             P10/95C   7H  16    0    0G   200.000  5000.000  1391.000    1
- 2.22148969e+01 3.47675750e-02-1.18407129e-05 1.83298478e-09-1.06130266e-13    2
--3.42760081e+04-9.23040196e+01-1.26836187e+00 8.54355820e-02-5.25346786e-05    3
- 1.62945721e-08-2.02394925e-12-2.56586565e+04 3.53732912e+01                   4
-C7H15-1    2/10/95      C   7H  15    0    0G   200.000  5000.000  1391.000    1
- 2.17940709e+01 3.26280243e-02-1.11138244e-05 1.72067148e-09-9.96366999e-14    2
--9.20938221e+03-8.64954311e+01-4.99570406e-01 8.08826467e-02-5.00532754e-05    3
- 1.56549308e-08-1.96616227e-12-1.04590223e+03 3.46564011e+01                   4
-C7H15-2    2/10/95      C   7H  15    0    0G   200.000  5000.000  1391.000    1
- 2.16368842e+01 3.23324804e-02-1.09273807e-05 1.68357060e-09-9.71774091e-14    2
--1.05873616e+04-8.52209653e+01-3.79155767e-02 7.56726570e-02-4.07473634e-05    3
- 9.32678943e-09-4.92360745e-13-2.35605303e+03 3.37321506e+01                   4
-C4H9              P10/84C  4.H  9.   0.   0.G   200.000  6000.000              1
- 9.43040607E+00 2.34271349E-02-8.53599182E-06 1.39748355E-09-8.44057456E-14    2
- 2.14214862E+03-2.42207994E+01 3.54885235E+00 1.78747638E-02 5.00782825E-05    3
--7.94475071E-08 3.35802354E-11 4.74011588E+03 1.11849382E+01 6.89397210E+03    4
-C3H7            N-L 9/84C   3H   7    0    0G   200.000  5000.000              1
- 0.77026987E 01 0.16044203E-01-0.52833220E-05 0.76298590E-09-0.39392284E-13    2
- 0.82984336E 04-0.15480180E 02 0.10515518E 01 0.25991980E-01 0.23800540E-05    3
--0.19609569E-07 0.93732470E-11 0.10631863E 05 0.21122559E 02 0.12087447E 05    4
-C7H15O2    7/23/98      C  7.H 15.O  2.   0.G   200.000  5000.000              1
- 2.49023689e+01 3.50716920e-02-1.20440306e-05 1.87464822e-09-1.08947791e-13    2
--2.82976050e+04-9.73923542e+01 2.37499334e+00 8.34651906e-02-5.13897320e-05    3
- 1.64217662e-08-2.19505216e-12-1.99237961e+04 2.53067342e+01                   4
-C7H14O2H   7/23/98      C  7.H 15.O  2.   0.G   200.000  5000.000              1
- 2.70028807e+01 3.22272216e-02-1.09366516e-05 1.68977918e-09-9.77321946e-14    2
--2.27229231e+04-1.06332170e+02 2.49875186e+00 8.32443344e-02-4.85933986e-05    3
- 1.28927950e-08-1.09878385e-12-1.36530733e+04 2.73754005e+01                   4
-C7H14O2HO2   7/23/98    C  7.H 15.O  4.   0.G   200.000  5000.000              1
- 3.23937788e+01 3.33911097e-02-1.15672104e-05 1.81146023e-09-1.05739941e-13    2
--4.36321048e+04-1.32597311e+02 3.84933185e+00 9.45955097e-02-5.94934121e-05    3
- 1.78836457e-08-2.00618696e-12-3.32051631e+04 2.25912030e+01                   4
-C7KET12    7/23/98      C  7.H 14.O  3.   0.G   200.000  5000.000              1
- 2.97472906e+01 3.06622294e-02-1.05563590e-05 1.64627343e-09-9.58171675e-14    2
--5.66856828e+04-1.22432490e+02 5.82433697e-01 1.01207869e-01-7.65855996e-05    3
- 3.00738606e-08-4.82902792e-12-4.68054419e+04 3.33331449e+01                   4
-C7KET21    2/10/95      C  7.H 14.O  3.   0.G   200.000  5000.000 1382.000     1
- 2.80512936e+01 3.27356029e-02-1.14107044e-05 1.79404506e-09-1.05002142e-13    2
--5.89640173e+04-1.11392338e+02 4.19023030e+00 8.43118237e-02-5.44315814e-05    3
- 1.85837721e-08-2.72768938e-12-5.00570382e+04 1.85783455e+01                   4
-C5H11CHO   2/29/96      C   6H  12O   1    0G   200.000  5000.000              1
- 1.98891043e+01 2.71869340e-02-9.27391515e-06 1.43744158e-09-8.33090761e-14    2
--3.97523444e+04-7.60741671e+01 1.37517192e+00 6.65669689e-02-4.04423050e-05    3
- 1.23836270e-08-1.52905857e-12-3.28740986e+04 2.48343934e+01                   4
-C5H11CO    2/29/96      C  6.H 11.O  1.   0.G   200.000  5000.000              1
- 1.94783812e+01 2.50466029e-02-8.54861346e-06 1.32557944e-09-7.68503296e-14    2
--2.07923937e+04-7.21995578e+01 2.14479069e+00 6.17863563e-02-3.74134690e-05    3
- 1.13283795e-08-1.36917698e-12-1.43451172e+04 2.23128045e+01                   4
-C5H11             T03/97C  5.H 11.   0.   0.G   200.000  5000.000              1
- 1.13324106E+01 3.03659897E-02-1.13934480E-05 1.99539733E-09-1.32825012E-13    2
--5.95299959E+03-3.13564905E+01 3.57867617E+00 3.04236365E-02 3.27768270E-05    3
--5.86453147E-08 2.39315107E-11-2.60420265E+03 1.42591121E+01 6.68760000E+03    4
-CH3O2             L 1/84C   1H   3O   2N   0G   200.000  5000.00               1
- 0.66812963E 01 0.80057271E-02-0.27188507E-05 0.40631365E-09-0.21927725E-13    2
- 0.52621851E 03-0.99423847E 01 0.20986490E 01 0.15786357E-01 0.75683261E-07    3
--0.11274587E-07 0.56665133E-11 0.20695879E 04 0.15007068E 02                   4
-CH4O2             T11/96C   1H   4O   2    0G   200.000  6000.000              1
- 6.86907934E+00 1.00840883E-02-3.66515947E-06 5.96302681E-10-3.58894156E-14    2
--1.98402231E+04-1.24951986E+01 3.72654981E+00 7.51851847E-03 2.35970425E-05    3
--3.52694507E-08 1.42757614E-11-1.83982011E+04 6.52443362E+00-1.68074366E+04    4
-C6H12      2/14/95      C  6.H 12.O  0.   0.G   200.000  5000.000              1
- 1.78337529e+01 2.67377658e-02-9.10036773e-06 1.40819768e-09-8.15124244e-14    2
--1.42062860e+04-6.83818851e+01-1.35275205e+00 6.98655426e-02-4.59408022e-05    3
- 1.56967343e-08-2.21296175e-12-7.34368617e+03 3.53120691e+01                   4
-C3H5              BUR 92C   3H   5O   0N   0G   200.000  6000.000              1
- 6.54761132E+00 1.33152246E-02-4.78333100E-06 7.71949814E-10-4.61930808E-14    2
- 1.72714707E+04-9.27486841E+00 3.78794693E+00 9.48414335E-03 2.42343368E-05    3
--3.65604010E-08 1.48592356E-11 1.86261218E+04 7.82822499E+00 2.03259122E+04    4
-CH3CHO            L 8/88C   2H   4O   1     G   200.000  6000.000  1000.000    1
- 0.54041108E+01 0.11723059E-01-0.42263137E-05 0.68372451E-09-0.40984863E-13    2
--0.22593122E+05-0.34807917E+01 0.47294595E+01-0.31932858E-02 0.47534921E-04    3
--0.57458611E-07 0.21931112E-10-0.21572878E+05 0.41030159E+01                   4
-C3H3              BUR 92C   3H   3O   0N   0G   200.000  6000.000              1
- 6.64175821E+00 8.08587428E-03-2.84787887E-06 4.53525977E-10-2.68879815E-14    2
- 3.89793699E+04-1.04004255E+01 1.82840766E+00 2.37839036E-02-2.19228176E-05    3
- 1.00067444E-08-1.38984644E-12 4.01863058E+04 1.38447957E+01 4.16139977E+04    4
-C4H3              L 9/89C   4H   3O   0N   0G   200.000  6000.000              1
- 0.84762079E+01 0.88782327E-02-0.30328412E-05 0.47358302E-09-0.27716627E-13    2
- 0.54756540E+05-0.17170551E+02 0.24173247E+01 0.24104782E-01-0.12813470E-04    3
--0.28606237E-08 0.39194527E-11 0.56506476E+05 0.14471107E+02 0.58181574E+05    4
-CH2CHO            SAND86O   1H   3C   2     G   200.000  5000.000  1000.000    1
- 0.05975670E+02 0.08130591E-01-0.02743624E-04 0.04070304E-08-0.02176017E-12    2
- 0.04903218E+04-0.05045251E+02 0.03409062E+02 0.10738574E-01 0.01891492E-04    3
--0.07158583E-07 0.02867385E-10 0.15214766E+04 0.09558290E+02                   4
-END
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
new file mode 100644
index 0000000000..27bec3ad2f
--- /dev/null
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
@@ -0,0 +1,97 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      foam.dat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+CO2
+{
+    nMoles          1;
+    molWeight       44.01;
+    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 );
+    As              1.67212e-06;
+    Ts              170.6;
+}
+
+CH4
+{
+    nMoles          1;
+    molWeight       16.043;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2
+{
+    nMoles          1;
+    molWeight       2.01594;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.inp b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.inp
new file mode 100644
index 0000000000..931071dabe
--- /dev/null
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.inp
@@ -0,0 +1,28 @@
+species
+(
+    N2
+    O2
+    CH4
+    H2
+    CO2
+    H2O
+);
+
+reactions
+{
+    irreversibleArrheniusReaction
+    {
+        reaction "CH4 + 2O2^1.0 = CO2 + 2H2O^1.0";
+        A        7e+06;
+        beta     0;
+        Ta       10063.8;
+    }
+    irreversibleArrheniusReaction
+    {
+        reaction "H2 + 0.5O2^1.0 = H2O";
+        A        4.74342e+12;
+        beta     0;
+        Ta       10063.8;
+    }
+}
+
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index e8a86473f7..0e31f9f4f7 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -19,32 +19,32 @@ thermoType      hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
 
 chemistryReader foamChemistryReader;
 
-foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat";
+foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
 
-foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
+foamChemistryFile "$FOAM_CASE/constant/foam.inp";
 
 inertSpecie     N2;
 
 liquids
 {
-    liquidComponents
-    (
-        H2O
-    );
-
-    H2O             H2O defaultCoeffs;
+    liquidComponents ( H2O );
+    H2O
+    {
+        defaultCoeffs   yes;
+    }
 }
 
 solids
 {
-    solidComponents
-    (
-        C
-        ash
-    );
-
-    C               C defaultCoeffs;
-    ash             ash defaultCoeffs;
+    solidComponents ( C ash );
+    C
+    {
+        defaultCoeffs   yes;
+    }
+    ash
+    {
+        defaultCoeffs   yes;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactions
index 45f51fa38f..8407cfc9cc 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactions
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactions
@@ -6,5 +6,5 @@ species
 );
 
 reactions
-(
-);
+{}
+
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
index 16729ac9d9..934bc094e6 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
@@ -1,191 +1,67 @@
-(
-N2 N2   1   28.0134
-    rhoPolynomial
-    (
-        3.8936E+00
-       -1.6463E-02
-        3.2101E-05
-       -2.9174E-08
-        9.9889E-12
-        0
-        0
-        0
-    )
-    0.0                                 // Heat of formation
-    0.0                                 // Standard entropy
-    cpPolynomial
-    (
-        9.7908E+02
-        4.1787E-01
-       -1.1761E-03
-        1.6742E-06
-       -7.2559E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        3.1494E-03
-        8.4997E-05
-       -1.2621E-08
-        0
-        0
-        0
-        0
-        0
-    )
-O2 O2   1   31.9988
-    rhoPolynomial
-    (
-        4.4475E+00
-       -1.8805E-02
-        3.6667E-05
-       -3.3323E-08
-        1.1410E-11
-        0
-        0
-        0
-    )
-    0.0                                 // Heat of formation
-    0.0                                 // Standard entropy
-    cpPolynomial
-    (
-        8.3484E+02
-        2.9297E-01
-       -1.4959E-04
-        3.4143E-07
-       -2.2786E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        1.6082E-04
-        8.5301E-05
-       -1.4998E-08
-        0
-        0
-        0
-        0
-        0
-    )
-H2O H2O 1   18.0153
-    rhoPolynomial
-    (
-        2.5039E+00
-       -1.0587E-02
-        2.0643E-05
-       -1.8761E-08
-        6.4237E-12
-        0
-        0
-        0
-    )
-   -1.3423e07                                // Heat of formation [J/kg]
-    1.0482e04                                // Standard entropy [J/kg/K]
-    cpPolynomial
-    (
-        1.5631E+03
-        1.6040E+00
-       -2.9334E-03
-        3.2168E-06
-       -1.1571E-09
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        3.7972E-03
-        1.5336E-04
-       -1.1859E-08
-        0
-        0
-        0
-        0
-        0
-    )
-air air 1   28.85
-    rhoPolynomial
-    (
-        4.0097E+00
-       -1.6954E-02
-        3.3057E-05
-       -3.0042E-08
-        1.0286E-11
-        0
-        0
-        0
-    )
-    0.0
-    0.0
-    cpPolynomial
-    (
-        9.4876E+02
-        3.9171E-01
-       -9.5999E-04
-        1.3930E-06
-       -6.2029E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5061E-06
-        6.1600E-08
-       -1.8190E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        2.5219E-03
-        8.5060E-05
-       -1.3120E-08
-        0
-        0
-        0
-        0
-        0
-    )
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermo.incompressiblePoly;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    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 );
+    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
+{
+    nMoles          1;
+    molWeight       31.9988;
+    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 );
+    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
+{
+    nMoles          1;
+    molWeight       18.0153;
+    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 );
+    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
+{
+    nMoles          1;
+    molWeight       28.85;
+    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 );
+    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 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
index 973c921270..6fc98cd5a4 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
@@ -25,22 +25,18 @@ foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
 
 liquids
 {
-    liquidComponents
-    (
-        H2O
-    );
-
-    H2O             H2O defaultCoeffs;
+    liquidComponents ( H2O );
+    H2O
+    {
+        defaultCoeffs   yes;
+    }
 }
 
 solids
 {
-    solidComponents
-    (
-    );
+    solidComponents ( );
 }
 
-
 inertSpecie     N2;
 
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactions
index f1c604b507..0e11adc360 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactions
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactions
@@ -5,5 +5,5 @@ species
 );
 
 reactions
-(
-);
+{}
+
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
index 16729ac9d9..934bc094e6 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
@@ -1,191 +1,67 @@
-(
-N2 N2   1   28.0134
-    rhoPolynomial
-    (
-        3.8936E+00
-       -1.6463E-02
-        3.2101E-05
-       -2.9174E-08
-        9.9889E-12
-        0
-        0
-        0
-    )
-    0.0                                 // Heat of formation
-    0.0                                 // Standard entropy
-    cpPolynomial
-    (
-        9.7908E+02
-        4.1787E-01
-       -1.1761E-03
-        1.6742E-06
-       -7.2559E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        3.1494E-03
-        8.4997E-05
-       -1.2621E-08
-        0
-        0
-        0
-        0
-        0
-    )
-O2 O2   1   31.9988
-    rhoPolynomial
-    (
-        4.4475E+00
-       -1.8805E-02
-        3.6667E-05
-       -3.3323E-08
-        1.1410E-11
-        0
-        0
-        0
-    )
-    0.0                                 // Heat of formation
-    0.0                                 // Standard entropy
-    cpPolynomial
-    (
-        8.3484E+02
-        2.9297E-01
-       -1.4959E-04
-        3.4143E-07
-       -2.2786E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        1.6082E-04
-        8.5301E-05
-       -1.4998E-08
-        0
-        0
-        0
-        0
-        0
-    )
-H2O H2O 1   18.0153
-    rhoPolynomial
-    (
-        2.5039E+00
-       -1.0587E-02
-        2.0643E-05
-       -1.8761E-08
-        6.4237E-12
-        0
-        0
-        0
-    )
-   -1.3423e07                                // Heat of formation [J/kg]
-    1.0482e04                                // Standard entropy [J/kg/K]
-    cpPolynomial
-    (
-        1.5631E+03
-        1.6040E+00
-       -2.9334E-03
-        3.2168E-06
-       -1.1571E-09
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        3.7972E-03
-        1.5336E-04
-       -1.1859E-08
-        0
-        0
-        0
-        0
-        0
-    )
-air air 1   28.85
-    rhoPolynomial
-    (
-        4.0097E+00
-       -1.6954E-02
-        3.3057E-05
-       -3.0042E-08
-        1.0286E-11
-        0
-        0
-        0
-    )
-    0.0
-    0.0
-    cpPolynomial
-    (
-        9.4876E+02
-        3.9171E-01
-       -9.5999E-04
-        1.3930E-06
-       -6.2029E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5061E-06
-        6.1600E-08
-       -1.8190E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        2.5219E-03
-        8.5060E-05
-       -1.3120E-08
-        0
-        0
-        0
-        0
-        0
-    )
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermo.incompressiblePoly;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    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 );
+    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
+{
+    nMoles          1;
+    molWeight       31.9988;
+    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 );
+    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
+{
+    nMoles          1;
+    molWeight       18.0153;
+    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 );
+    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
+{
+    nMoles          1;
+    molWeight       28.85;
+    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 );
+    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 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties
index 271188f6f8..1426d6c27b 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties
@@ -32,7 +32,10 @@ liquids
         H2O
     );
 
-    H2O             H2O defaultCoeffs;
+    H2O
+    {
+        defaultCoeffs yes;
+    }
 }
 
 solids
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactions
index f1c604b507..0e11adc360 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactions
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactions
@@ -5,5 +5,5 @@ species
 );
 
 reactions
-(
-);
+{}
+
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index 16729ac9d9..d87c99af18 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -1,191 +1,55 @@
-(
-N2 N2   1   28.0134
-    rhoPolynomial
-    (
-        3.8936E+00
-       -1.6463E-02
-        3.2101E-05
-       -2.9174E-08
-        9.9889E-12
-        0
-        0
-        0
-    )
-    0.0                                 // Heat of formation
-    0.0                                 // Standard entropy
-    cpPolynomial
-    (
-        9.7908E+02
-        4.1787E-01
-       -1.1761E-03
-        1.6742E-06
-       -7.2559E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        3.1494E-03
-        8.4997E-05
-       -1.2621E-08
-        0
-        0
-        0
-        0
-        0
-    )
-O2 O2   1   31.9988
-    rhoPolynomial
-    (
-        4.4475E+00
-       -1.8805E-02
-        3.6667E-05
-       -3.3323E-08
-        1.1410E-11
-        0
-        0
-        0
-    )
-    0.0                                 // Heat of formation
-    0.0                                 // Standard entropy
-    cpPolynomial
-    (
-        8.3484E+02
-        2.9297E-01
-       -1.4959E-04
-        3.4143E-07
-       -2.2786E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        1.6082E-04
-        8.5301E-05
-       -1.4998E-08
-        0
-        0
-        0
-        0
-        0
-    )
-H2O H2O 1   18.0153
-    rhoPolynomial
-    (
-        2.5039E+00
-       -1.0587E-02
-        2.0643E-05
-       -1.8761E-08
-        6.4237E-12
-        0
-        0
-        0
-    )
-   -1.3423e07                                // Heat of formation [J/kg]
-    1.0482e04                                // Standard entropy [J/kg/K]
-    cpPolynomial
-    (
-        1.5631E+03
-        1.6040E+00
-       -2.9334E-03
-        3.2168E-06
-       -1.1571E-09
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        3.7972E-03
-        1.5336E-04
-       -1.1859E-08
-        0
-        0
-        0
-        0
-        0
-    )
-air air 1   28.85
-    rhoPolynomial
-    (
-        4.0097E+00
-       -1.6954E-02
-        3.3057E-05
-       -3.0042E-08
-        1.0286E-11
-        0
-        0
-        0
-    )
-    0.0
-    0.0
-    cpPolynomial
-    (
-        9.4876E+02
-        3.9171E-01
-       -9.5999E-04
-        1.3930E-06
-       -6.2029E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5061E-06
-        6.1600E-08
-       -1.8190E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        2.5219E-03
-        8.5060E-05
-       -1.3120E-08
-        0
-        0
-        0
-        0
-        0
-    )
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermo.incompressiblePoly;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    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 );
+    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
+{
+    nMoles          1;
+    molWeight       18.0153;
+    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 );
+    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
+{
+    nMoles          1;
+    molWeight       28.85;
+    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 );
+    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 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 271188f6f8..0c8e174053 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -32,7 +32,10 @@ liquids
         H2O
     );
 
-    H2O             H2O defaultCoeffs;
+    H2O
+    {
+        defaultCoeffs   yes;
+    }
 }
 
 solids
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/chem.inp b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/chem.inp
deleted file mode 100644
index e1c6680825..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/chem.inp
+++ /dev/null
@@ -1,6 +0,0 @@
-ELEMENTS
-O  H  N
-END
-SPECIES
-N2  O2 H2O
-END
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.dat
deleted file mode 100644
index 36ef324312..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.dat
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-O2 O2   1   31.9988
-    200 5000    1000
-    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
-    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
-    1.67212e-06 170.672
-H2O H2O 1   18.0153
-    200 5000    1000
-    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
-    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
-    1.67212e-06 170.672
-N2 N2   1   28.0134
-    200 5000    1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
-    1.67212e-06 170.672
-)
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/therm.dat b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/therm.dat
deleted file mode 100644
index 2a896be398..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/therm.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-THERMO ALL
-   200.000  1000.000  5000.000
-H2O                20387H   2O   1          G  0200.00   5000.00  1000.00      1
- 0.02672146E+02 0.03056293E-01-0.08730260E-05 0.01200996E-08-0.06391618E-13    2
--0.02989921E+06 0.06862817E+02 0.03386842E+02 0.03474982E-01-0.06354696E-04    3
- 0.06968581E-07-0.02506588E-10-0.03020811E+06 0.02590233E+02                   4
-N2                121286N   2               G  0200.00   5000.00  1000.00      1
- 0.02926640E+02 0.01487977E-01-0.05684761E-05 0.01009704E-08-0.06753351E-13    2
--0.09227977E+04 0.05980528E+02 0.03298677E+02 0.01408240E-01-0.03963222E-04    3
- 0.05641515E-07-0.02444855E-10-0.01020900E+05 0.03950372E+02                   4
-O2                121386O   2               G  0200.00   5000.00  1000.00      1
- 0.03697578E+02 0.06135197E-02-0.01258842E-05 0.01775281E-09-0.01136435E-13    2
--0.01233930E+05 0.03189166E+02 0.03212936E+02 0.01127486E-01-0.05756150E-05    3
- 0.01313877E-07-0.08768554E-11-0.01005249E+05 0.06034738E+02                   4
-END
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/foam.dat
new file mode 100644
index 0000000000..27c95adb95
--- /dev/null
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/foam.dat
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      foam.dat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/foam.inp b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/foam.inp
similarity index 88%
rename from tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/foam.inp
rename to tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/foam.inp
index 80d66f62c0..84c3df95ee 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/foam.inp
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/foam.inp
@@ -3,9 +3,8 @@ species
     O2
     H2O
     N2
-)
-;
+);
 
 reactions
-(
-);
+{}
+
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/thermophysicalProperties
index 01f72e1ffe..8b155848ab 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/thermophysicalProperties
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -19,28 +19,24 @@ thermoType      hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
 
 chemistryReader foamChemistryReader;
 
-foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
+foamChemistryFile "$FOAM_CASE/constant/foam.inp";
 
-foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat";
+foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
 
 inertSpecie     N2;
 
-
 liquids
 {
-    liquidComponents
-    (
-        H2O
-    );
-
-    H2O             H2O defaultCoeffs;
+    liquidComponents ( H2O );
+    H2O
+    {
+        defaultCoeffs   yes;
+    }
 }
 
-
 solids
 {
-    solidComponents
-    ();
+    solidComponents ( );
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/chem.inp b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/chem.inp
deleted file mode 100644
index e1c6680825..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/chem.inp
+++ /dev/null
@@ -1,6 +0,0 @@
-ELEMENTS
-O  H  N
-END
-SPECIES
-N2  O2 H2O
-END
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/foam.dat
deleted file mode 100644
index 36ef324312..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/foam.dat
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-O2 O2   1   31.9988
-    200 5000    1000
-    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
-    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
-    1.67212e-06 170.672
-H2O H2O 1   18.0153
-    200 5000    1000
-    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
-    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
-    1.67212e-06 170.672
-N2 N2   1   28.0134
-    200 5000    1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
-    1.67212e-06 170.672
-)
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/therm.dat b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/therm.dat
deleted file mode 100644
index 2a896be398..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/therm.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-THERMO ALL
-   200.000  1000.000  5000.000
-H2O                20387H   2O   1          G  0200.00   5000.00  1000.00      1
- 0.02672146E+02 0.03056293E-01-0.08730260E-05 0.01200996E-08-0.06391618E-13    2
--0.02989921E+06 0.06862817E+02 0.03386842E+02 0.03474982E-01-0.06354696E-04    3
- 0.06968581E-07-0.02506588E-10-0.03020811E+06 0.02590233E+02                   4
-N2                121286N   2               G  0200.00   5000.00  1000.00      1
- 0.02926640E+02 0.01487977E-01-0.05684761E-05 0.01009704E-08-0.06753351E-13    2
--0.09227977E+04 0.05980528E+02 0.03298677E+02 0.01408240E-01-0.03963222E-04    3
- 0.05641515E-07-0.02444855E-10-0.01020900E+05 0.03950372E+02                   4
-O2                121386O   2               G  0200.00   5000.00  1000.00      1
- 0.03697578E+02 0.06135197E-02-0.01258842E-05 0.01775281E-09-0.01136435E-13    2
--0.01233930E+05 0.03189166E+02 0.03212936E+02 0.01127486E-01-0.05756150E-05    3
- 0.01313877E-07-0.08768554E-11-0.01005249E+05 0.06034738E+02                   4
-END
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
new file mode 100644
index 0000000000..27c95adb95
--- /dev/null
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      foam.dat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/foam.inp b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.inp
similarity index 88%
rename from tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/foam.inp
rename to tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.inp
index 80d66f62c0..84c3df95ee 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/foam.inp
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.inp
@@ -3,9 +3,8 @@ species
     O2
     H2O
     N2
-)
-;
+);
 
 reactions
-(
-);
+{}
+
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
index 01f72e1ffe..8b155848ab 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -19,28 +19,24 @@ thermoType      hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
 
 chemistryReader foamChemistryReader;
 
-foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
+foamChemistryFile "$FOAM_CASE/constant/foam.inp";
 
-foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat";
+foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
 
 inertSpecie     N2;
 
-
 liquids
 {
-    liquidComponents
-    (
-        H2O
-    );
-
-    H2O             H2O defaultCoeffs;
+    liquidComponents ( H2O );
+    H2O
+    {
+        defaultCoeffs   yes;
+    }
 }
 
-
 solids
 {
-    solidComponents
-    ();
+    solidComponents ( );
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/chem.inp b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/chem.inp
deleted file mode 100644
index e1c6680825..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/chem.inp
+++ /dev/null
@@ -1,6 +0,0 @@
-ELEMENTS
-O  H  N
-END
-SPECIES
-N2  O2 H2O
-END
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/foam.dat
deleted file mode 100644
index 36ef324312..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/foam.dat
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-O2 O2   1   31.9988
-    200 5000    1000
-    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
-    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
-    1.67212e-06 170.672
-H2O H2O 1   18.0153
-    200 5000    1000
-    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
-    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
-    1.67212e-06 170.672
-N2 N2   1   28.0134
-    200 5000    1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
-    1.67212e-06 170.672
-)
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/therm.dat b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/therm.dat
deleted file mode 100644
index 2a896be398..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/therm.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-THERMO ALL
-   200.000  1000.000  5000.000
-H2O                20387H   2O   1          G  0200.00   5000.00  1000.00      1
- 0.02672146E+02 0.03056293E-01-0.08730260E-05 0.01200996E-08-0.06391618E-13    2
--0.02989921E+06 0.06862817E+02 0.03386842E+02 0.03474982E-01-0.06354696E-04    3
- 0.06968581E-07-0.02506588E-10-0.03020811E+06 0.02590233E+02                   4
-N2                121286N   2               G  0200.00   5000.00  1000.00      1
- 0.02926640E+02 0.01487977E-01-0.05684761E-05 0.01009704E-08-0.06753351E-13    2
--0.09227977E+04 0.05980528E+02 0.03298677E+02 0.01408240E-01-0.03963222E-04    3
- 0.05641515E-07-0.02444855E-10-0.01020900E+05 0.03950372E+02                   4
-O2                121386O   2               G  0200.00   5000.00  1000.00      1
- 0.03697578E+02 0.06135197E-02-0.01258842E-05 0.01775281E-09-0.01136435E-13    2
--0.01233930E+05 0.03189166E+02 0.03212936E+02 0.01127486E-01-0.05756150E-05    3
- 0.01313877E-07-0.08768554E-11-0.01005249E+05 0.06034738E+02                   4
-END
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/foam.dat
new file mode 100644
index 0000000000..27c95adb95
--- /dev/null
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/foam.dat
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      foam.dat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/foam.inp b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/foam.inp
similarity index 88%
rename from tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/foam.inp
rename to tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/foam.inp
index 80d66f62c0..84c3df95ee 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/foam.inp
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/foam.inp
@@ -3,9 +3,8 @@ species
     O2
     H2O
     N2
-)
-;
+);
 
 reactions
-(
-);
+{}
+
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/thermophysicalProperties
index bddd3c5458..8b155848ab 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/thermophysicalProperties
@@ -19,26 +19,24 @@ thermoType      hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
 
 chemistryReader foamChemistryReader;
 
-foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
+foamChemistryFile "$FOAM_CASE/constant/foam.inp";
 
-foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat";
+foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
 
 inertSpecie     N2;
 
 liquids
 {
-    liquidComponents
-    (
-        H2O
-    );
-
-    H2O             H2O defaultCoeffs;
+    liquidComponents ( H2O );
+    H2O
+    {
+        defaultCoeffs   yes;
+    }
 }
 
 solids
 {
-    solidComponents
-    ();
+    solidComponents ( );
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/chem.inp b/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/chem.inp
deleted file mode 100644
index e1c6680825..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/chem.inp
+++ /dev/null
@@ -1,6 +0,0 @@
-ELEMENTS
-O  H  N
-END
-SPECIES
-N2  O2 H2O
-END
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/foam.dat
deleted file mode 100644
index 36ef324312..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/foam.dat
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-O2 O2   1   31.9988
-    200 5000    1000
-    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
-    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
-    1.67212e-06 170.672
-H2O H2O 1   18.0153
-    200 5000    1000
-    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
-    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
-    1.67212e-06 170.672
-N2 N2   1   28.0134
-    200 5000    1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
-    1.67212e-06 170.672
-)
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/therm.dat b/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/therm.dat
deleted file mode 100644
index 2a896be398..0000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/chemkin/therm.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-THERMO ALL
-   200.000  1000.000  5000.000
-H2O                20387H   2O   1          G  0200.00   5000.00  1000.00      1
- 0.02672146E+02 0.03056293E-01-0.08730260E-05 0.01200996E-08-0.06391618E-13    2
--0.02989921E+06 0.06862817E+02 0.03386842E+02 0.03474982E-01-0.06354696E-04    3
- 0.06968581E-07-0.02506588E-10-0.03020811E+06 0.02590233E+02                   4
-N2                121286N   2               G  0200.00   5000.00  1000.00      1
- 0.02926640E+02 0.01487977E-01-0.05684761E-05 0.01009704E-08-0.06753351E-13    2
--0.09227977E+04 0.05980528E+02 0.03298677E+02 0.01408240E-01-0.03963222E-04    3
- 0.05641515E-07-0.02444855E-10-0.01020900E+05 0.03950372E+02                   4
-O2                121386O   2               G  0200.00   5000.00  1000.00      1
- 0.03697578E+02 0.06135197E-02-0.01258842E-05 0.01775281E-09-0.01136435E-13    2
--0.01233930E+05 0.03189166E+02 0.03212936E+02 0.01127486E-01-0.05756150E-05    3
- 0.01313877E-07-0.08768554E-11-0.01005249E+05 0.06034738E+02                   4
-END
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/foam.dat
new file mode 100644
index 0000000000..27c95adb95
--- /dev/null
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/foam.dat
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      foam.dat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.inp b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/foam.inp
similarity index 88%
rename from tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.inp
rename to tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/foam.inp
index 80d66f62c0..84c3df95ee 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.inp
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/foam.inp
@@ -3,9 +3,8 @@ species
     O2
     H2O
     N2
-)
-;
+);
 
 reactions
-(
-);
+{}
+
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/thermophysicalProperties
index e57087805d..8b155848ab 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/thermophysicalProperties
@@ -19,29 +19,25 @@ thermoType      hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
 
 chemistryReader foamChemistryReader;
 
-foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
+foamChemistryFile "$FOAM_CASE/constant/foam.inp";
 
-foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat";
+foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
 
 inertSpecie     N2;
 
 liquids
 {
-    liquidComponents
-    (
-        H2O
-    );
-
-    H2O             H2O defaultCoeffs;
+    liquidComponents ( H2O );
+    H2O
+    {
+        defaultCoeffs   yes;
+    }
 }
 
 solids
 {
-    solidComponents
-    ();
+    solidComponents ( );
 }
 
 
-
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/chem.inp b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/chem.inp
deleted file mode 100644
index e1c6680825..0000000000
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/chem.inp
+++ /dev/null
@@ -1,6 +0,0 @@
-ELEMENTS
-O  H  N
-END
-SPECIES
-N2  O2 H2O
-END
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.dat b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.dat
deleted file mode 100644
index 36ef324312..0000000000
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.dat
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-O2 O2   1   31.9988
-    200 5000    1000
-    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
-    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
-    1.67212e-06 170.672
-H2O H2O 1   18.0153
-    200 5000    1000
-    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
-    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
-    1.67212e-06 170.672
-N2 N2   1   28.0134
-    200 5000    1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
-    1.67212e-06 170.672
-)
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.inp b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.inp
deleted file mode 100644
index 80d66f62c0..0000000000
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.inp
+++ /dev/null
@@ -1,11 +0,0 @@
-species
-(
-    O2
-    H2O
-    N2
-)
-;
-
-reactions
-(
-);
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/therm.dat b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/therm.dat
deleted file mode 100644
index 2a896be398..0000000000
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/chemkin/therm.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-THERMO ALL
-   200.000  1000.000  5000.000
-H2O                20387H   2O   1          G  0200.00   5000.00  1000.00      1
- 0.02672146E+02 0.03056293E-01-0.08730260E-05 0.01200996E-08-0.06391618E-13    2
--0.02989921E+06 0.06862817E+02 0.03386842E+02 0.03474982E-01-0.06354696E-04    3
- 0.06968581E-07-0.02506588E-10-0.03020811E+06 0.02590233E+02                   4
-N2                121286N   2               G  0200.00   5000.00  1000.00      1
- 0.02926640E+02 0.01487977E-01-0.05684761E-05 0.01009704E-08-0.06753351E-13    2
--0.09227977E+04 0.05980528E+02 0.03298677E+02 0.01408240E-01-0.03963222E-04    3
- 0.05641515E-07-0.02444855E-10-0.01020900E+05 0.03950372E+02                   4
-O2                121386O   2               G  0200.00   5000.00  1000.00      1
- 0.03697578E+02 0.06135197E-02-0.01258842E-05 0.01775281E-09-0.01136435E-13    2
--0.01233930E+05 0.03189166E+02 0.03212936E+02 0.01127486E-01-0.05756150E-05    3
- 0.01313877E-07-0.08768554E-11-0.01005249E+05 0.06034738E+02                   4
-END
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.dat
new file mode 100644
index 0000000000..27c95adb95
--- /dev/null
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.dat
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      foam.dat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    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 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.inp b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.inp
new file mode 100644
index 0000000000..84c3df95ee
--- /dev/null
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.inp
@@ -0,0 +1,10 @@
+species
+(
+    O2
+    H2O
+    N2
+);
+
+reactions
+{}
+
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
index bddd3c5458..8b155848ab 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
@@ -19,26 +19,24 @@ thermoType      hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
 
 chemistryReader foamChemistryReader;
 
-foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
+foamChemistryFile "$FOAM_CASE/constant/foam.inp";
 
-foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat";
+foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
 
 inertSpecie     N2;
 
 liquids
 {
-    liquidComponents
-    (
-        H2O
-    );
-
-    H2O             H2O defaultCoeffs;
+    liquidComponents ( H2O );
+    H2O
+    {
+        defaultCoeffs   yes;
+    }
 }
 
 solids
 {
-    solidComponents
-    ();
+    solidComponents ( );
 }
 
 
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties
index 867f77128d..38d196f30e 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      hsPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1007 0 1.84e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1007;
+    Hf              0;
+    mu              1.84e-05;
+    Pr              0.7;
+}
 
 
 // ************************************************************************* //
diff --git a/wmake/rules/linux64Clang/c b/wmake/rules/linux64Clang/c
new file mode 100644
index 0000000000..7d7d4f61a1
--- /dev/null
+++ b/wmake/rules/linux64Clang/c
@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = clang -m64
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++
new file mode 100644
index 0000000000..75da3e4ad2
--- /dev/null
+++ b/wmake/rules/linux64Clang/c++
@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor
+
+CC          = clang++ -m64
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-60
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed
diff --git a/wmake/rules/linux64Clang/c++Debug b/wmake/rules/linux64Clang/c++Debug
new file mode 100644
index 0000000000..19bdb9c334
--- /dev/null
+++ b/wmake/rules/linux64Clang/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linux64Clang/c++Opt b/wmake/rules/linux64Clang/c++Opt
new file mode 100644
index 0000000000..3363be8090
--- /dev/null
+++ b/wmake/rules/linux64Clang/c++Opt
@@ -0,0 +1,3 @@
+#c++DBUG     = -O0 -DFULLDEBUG -g
+c++DBUG     =
+c++OPT      = -O3
diff --git a/wmake/rules/linux64Clang/c++Prof b/wmake/rules/linux64Clang/c++Prof
new file mode 100644
index 0000000000..3bda4dad55
--- /dev/null
+++ b/wmake/rules/linux64Clang/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linux64Clang/cDebug b/wmake/rules/linux64Clang/cDebug
new file mode 100644
index 0000000000..72b638f458
--- /dev/null
+++ b/wmake/rules/linux64Clang/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linux64Clang/cOpt b/wmake/rules/linux64Clang/cOpt
new file mode 100644
index 0000000000..17318709f1
--- /dev/null
+++ b/wmake/rules/linux64Clang/cOpt
@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3
diff --git a/wmake/rules/linux64Clang/cProf b/wmake/rules/linux64Clang/cProf
new file mode 100644
index 0000000000..ca3ac9bf5f
--- /dev/null
+++ b/wmake/rules/linux64Clang/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linux64Clang/general b/wmake/rules/linux64Clang/general
new file mode 100644
index 0000000000..809751cd0a
--- /dev/null
+++ b/wmake/rules/linux64Clang/general
@@ -0,0 +1,8 @@
+CPP        = cpp -traditional-cpp $(GFLAGS)
+
+PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/c
+include $(RULES)/c++
diff --git a/wmake/rules/linux64Clang/mplibHPMPI b/wmake/rules/linux64Clang/mplibHPMPI
new file mode 100644
index 0000000000..574492a236
--- /dev/null
+++ b/wmake/rules/linux64Clang/mplibHPMPI
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
diff --git a/wmake/rules/linuxClang/c b/wmake/rules/linuxClang/c
new file mode 100644
index 0000000000..99b3238306
--- /dev/null
+++ b/wmake/rules/linuxClang/c
@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = clang -m32
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++
new file mode 100644
index 0000000000..2f7a3bde44
--- /dev/null
+++ b/wmake/rules/linuxClang/c++
@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = clang++ -m32
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-60
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed
diff --git a/wmake/rules/linuxClang/c++Debug b/wmake/rules/linuxClang/c++Debug
new file mode 100644
index 0000000000..19bdb9c334
--- /dev/null
+++ b/wmake/rules/linuxClang/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxClang/c++Opt b/wmake/rules/linuxClang/c++Opt
new file mode 100644
index 0000000000..2aedabd628
--- /dev/null
+++ b/wmake/rules/linuxClang/c++Opt
@@ -0,0 +1,2 @@
+c++DBUG     =
+c++OPT      = -O3
diff --git a/wmake/rules/linuxClang/c++Prof b/wmake/rules/linuxClang/c++Prof
new file mode 100644
index 0000000000..3bda4dad55
--- /dev/null
+++ b/wmake/rules/linuxClang/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linuxClang/cDebug b/wmake/rules/linuxClang/cDebug
new file mode 100644
index 0000000000..72b638f458
--- /dev/null
+++ b/wmake/rules/linuxClang/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linuxClang/cOpt b/wmake/rules/linuxClang/cOpt
new file mode 100644
index 0000000000..17318709f1
--- /dev/null
+++ b/wmake/rules/linuxClang/cOpt
@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3
diff --git a/wmake/rules/linuxClang/cProf b/wmake/rules/linuxClang/cProf
new file mode 100644
index 0000000000..ca3ac9bf5f
--- /dev/null
+++ b/wmake/rules/linuxClang/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linuxClang/general b/wmake/rules/linuxClang/general
new file mode 100644
index 0000000000..97ce8c940c
--- /dev/null
+++ b/wmake/rules/linuxClang/general
@@ -0,0 +1,9 @@
+CPP        = cpp -traditional-cpp $(GFLAGS)
+LD         = ld -melf_i386
+
+PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/c
+include $(RULES)/c++
diff --git a/wmake/rules/linuxClang/mplibHPMPI b/wmake/rules/linuxClang/mplibHPMPI
new file mode 100644
index 0000000000..8aff40632b
--- /dev/null
+++ b/wmake/rules/linuxClang/mplibHPMPI
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
diff --git a/wmake/wmakeScheduler b/wmake/wmakeScheduler
index bfff68053a..fc60b9be4d 100755
--- a/wmake/wmakeScheduler
+++ b/wmake/wmakeScheduler
@@ -48,6 +48,11 @@
 #         eg,  export WM_NCOMPPROCS=$(wmakeScheduler -count)
 #
 #-------------------------------------------------------------------------------
+
+# csh sets HOST, bash sets HOSTNAME
+: ${HOST:=$HOSTNAME}
+
+
 lockDir=$HOME/.$WM_PROJECT/.wmake
 # fallback - 1 core on current host
 : ${WM_HOSTS:=$HOST:1}
@@ -184,14 +189,14 @@ do
                     # Set colour
                     colour="${colourList[$colourIndex]}"
 
-                    if [ "$host" = "$HOSTNAME" ]; then
+                    if [ "$host" = "$HOST" ]; then
                         eval $* 2>&1 | colourPipe "$colour"
                     else
                         ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | colourPipe "$colour"
                     fi
                     retval=$?
                 else
-                    if [ "$host" = "$HOSTNAME" ]; then
+                    if [ "$host" = "$HOST" ]; then
                         eval $* 2>&1
                     else
                         ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1