From fd677b9f148c4002d06c6fde397dd7fd4d1bd0c9 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 1 Oct 2012 11:40:11 +0100
Subject: [PATCH 01/14] ENH: Tutorial file updates

---
 .../multiRegionHeater/system/controlDict         | 16 ++++++++--------
 .../oscillatingBox/system/controlDict            |  8 ++++----
 .../verticalChannel/system/controlDict           |  6 +++---
 .../verticalChannel/system/controlDict           |  6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict
index 3c2b0204f2..ce425c2910 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict
@@ -52,16 +52,16 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
 
-        enabled         true;
+        enabled         yes;
         outputControl   outputTime;
 
         region          topAir;
 
-        // Output to log&file (true) or to file only
-        log             true;
+        // Output to log&file (yes) or to file only
+        log             yes;
 
         // Output field values as well
-        valueOutput     false;  //true;
+        valueOutput     no;
 
         // Type of source: patch/faceZone/sampledSurface
         source          patch;
@@ -85,16 +85,16 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
 
-        enabled         true;
+        enabled         yes;
         outputControl   outputTime;
 
         region          topAir;
 
-        // Output to log&file (true) or to file only
-        log             true;
+        // Output to log&file (yes) or to file only
+        log             yes;
 
         // Output field values as well
-        valueOutput     false;  //true;
+        valueOutput     no;
 
         // Type of source: patch/faceZone/sampledSurface
         source          patch;
diff --git a/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
index 6a1045207a..5155b313d4 100644
--- a/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
+++ b/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
@@ -62,7 +62,7 @@ functions
         pName           p;
         UName           U;
         rhoName         rhoInf;
-        log             true;
+        log             yes;
         rhoInf          1000;
         CofR            (0 0 0);
     }
@@ -71,11 +71,11 @@ functions
     {
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
-        enabled         true;
+        enabled         yes;
         outputControl   timeStep;
         outputInterval  1;
-        log             true;
-        valueOutput     false;
+        log             yes;
+        valueOutput     no;
         source          faceZone;
         sourceName      f0;
         operation       areaAverage;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict
index d8b6b24512..42ba5153d4 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict
@@ -52,10 +52,10 @@ functions
     {
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
-        enabled         true;
+        enabled         yes;
         outputControl   outputTime;
-        log             true;
-        valueOutput     true;
+        log             yes;
+        valueOutput     no;
         source          patch;
         sourceName      outlet;
         operation       weightedAverage;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
index 69e606e7fa..52d917a65f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
@@ -57,10 +57,10 @@ functions
     {
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
-        enabled         true;
+        enabled         yes;
         outputControl   outputTime;
-        log             true;
-        valueOutput     true;
+        log             yes;
+        valueOutput     no;
         source          patch;
         sourceName      outlet;
         operation       weightedAverage;

From fcc77aae2886676cbbe582b1057c4ece1cb68f83 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 1 Oct 2012 14:13:06 +0100
Subject: [PATCH 02/14] ENH: snappyHexMesh: allow sliding

---
 .../autoHexMeshDriver/autoLayerDriver.C       |  43 +++++-
 .../autoHexMeshDriver/autoLayerDriver.H       |   4 +-
 .../autoHexMeshDriver/autoLayerDriverShrink.C | 143 +++++++++++++-----
 3 files changed, 149 insertions(+), 41 deletions(-)

diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 26b4fb0187..464fdd2b8f 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -710,7 +710,8 @@ void Foam::autoLayerDriver::setNumLayers
     const indirectPrimitivePatch& pp,
     pointField& patchDisp,
     labelList& patchNLayers,
-    List<extrudeMode>& extrudeStatus
+    List<extrudeMode>& extrudeStatus,
+    label& nAddedCells
 ) const
 {
     const fvMesh& mesh = meshRefiner_.mesh();
@@ -797,6 +798,24 @@ void Foam::autoLayerDriver::setNumLayers
         }
     }
 
+
+    // Calculate number of cells to create
+    nAddedCells = 0;
+    forAll(pp.localFaces(), faceI)
+    {
+        const face& f = pp.localFaces()[faceI];
+
+        // Get max of extrusion per point
+        label nCells = 0;
+        forAll(f, fp)
+        {
+            nCells = max(nCells, patchNLayers[f[fp]]);
+        }
+
+        nAddedCells += nCells;
+    }
+    reduce(nAddedCells, sumOp<label>());
+
     //reduce(nConflicts, sumOp<label>());
     //
     //Info<< "Set displacement to zero for " << nConflicts
@@ -2491,9 +2510,13 @@ void Foam::autoLayerDriver::addLayers
     // extrudeStatus = EXTRUDE.
     labelList patchNLayers(pp().nPoints(), 0);
 
+    // Ideal number of cells added
+    label nIdealAddedCells = 0;
+
     // Whether to add edge for all pp.localPoints.
     List<extrudeMode> extrudeStatus(pp().nPoints(), EXTRUDE);
 
+
     {
         // Get number of layer per point from number of layers per patch
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2506,7 +2529,8 @@ void Foam::autoLayerDriver::addLayers
 
             patchDisp,
             patchNLayers,
-            extrudeStatus
+            extrudeStatus,
+            nIdealAddedCells
         );
 
         // Precalculate mesh edge labels for patch edges
@@ -2776,6 +2800,7 @@ void Foam::autoLayerDriver::addLayers
         layerParams.nSmoothNormals(),
         layerParams.nSmoothSurfaceNormals(),
         layerParams.minMedianAxisAngleCos(),
+        layerParams.featureAngle(),
 
         dispVec,
         medialRatio,
@@ -3101,10 +3126,24 @@ void Foam::autoLayerDriver::addLayers
 
         label nExtruded = countExtrusion(pp, extrudeStatus);
         label nTotFaces = returnReduce(pp().size(), sumOp<label>());
+        label nAddedCells = 0;
+        {
+            forAll(flaggedCells, cellI)
+            {
+                if (flaggedCells[cellI])
+                {
+                    nAddedCells++;
+                }
+            }
+            reduce(nAddedCells, sumOp<label>());
+        }
         Info<< "Extruding " << nExtruded
             << " out of " << nTotFaces
             << " faces (" << 100.0*nExtruded/nTotFaces << "%)."
             << " Removed extrusion at " << nTotChanged << " faces."
+            << endl
+            << "Added " << nAddedCells << " out of " << nIdealAddedCells
+            << " cells (" << 100.0*nAddedCells/nIdealAddedCells << "%)."
             << endl;
 
         if (nTotChanged == 0)
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
index d36d15a4cb..f0a2f5d377 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
@@ -192,7 +192,8 @@ class autoLayerDriver
                     const indirectPrimitivePatch& pp,
                     pointField& patchDisp,
                     labelList& patchNLayers,
-                    List<extrudeMode>& extrudeStatus
+                    List<extrudeMode>& extrudeStatus,
+                    label& nIdealAddedCells
                 ) const;
 
                 //- Helper function to make a pointVectorField with correct
@@ -469,6 +470,7 @@ class autoLayerDriver
                     const label nSmoothNormals,
                     const label nSmoothSurfaceNormals,
                     const scalar minMedianAxisAngleCos,
+                    const scalar featureAngle,
 
                     pointVectorField& dispVec,
                     pointScalarField& medialRatio,
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
index db246ba1f2..ba0b77effe 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -33,9 +33,10 @@ Description
 #include "motionSmoother.H"
 #include "pointData.H"
 #include "PointEdgeWave.H"
-#include "OFstream.H"
+#include "OBJstream.H"
 #include "meshTools.H"
 #include "PatchTools.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -775,6 +776,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
     const label nSmoothNormals,
     const label nSmoothSurfaceNormals,
     const scalar minMedianAxisAngleCos,
+    const scalar featureAngle,
 
     pointVectorField& dispVec,
     pointScalarField& medialRatio,
@@ -904,7 +906,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
                 const edge& e = edges[edgeI];
                 // Approximate medial axis location on edge.
                 //const point medialAxisPt = e.centre(points);
-                vector eVec = e.vec(mesh.points());
+                vector eVec = e.vec(points);
                 scalar eMag = mag(eVec);
                 if (eMag > VSMALL)
                 {
@@ -961,42 +963,111 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
 
         labelHashSet adaptPatches(meshMover.adaptPatchIDs());
 
+
         forAll(patches, patchI)
         {
             const polyPatch& pp = patches[patchI];
-            //const pointPatchVectorField& pvf =
-            //    meshMover.displacement().boundaryField()[patchI];
+            const pointPatchVectorField& pvf =
+                meshMover.displacement().boundaryField()[patchI];
 
             if
             (
                 !pp.coupled()
              && !isA<emptyPolyPatch>(pp)
-             //&&  pvf.constraintType() != word::null //exclude fixedValue
              && !adaptPatches.found(patchI)
             )
             {
-                Info<< "Inserting points on patch " << pp.name() << endl;
-
                 const labelList& meshPoints = pp.meshPoints();
 
-                forAll(meshPoints, i)
+                // Check the type of the patchField. The types are
+                //  - fixedValue (0 or more layers) but the >0 layers have
+                //    already been handled in the adaptPatches loop
+                //  - constraint (but not coupled) types, e.g. symmetryPlane,
+                //    slip.
+                if (pvf.fixesValue())
                 {
-                    label pointI = meshPoints[i];
+                    // Disable all movement on fixedValue patchFields
+                    Info<< "Inserting all points on patch " << pp.name()
+                        << endl;
 
-                    if (!pointMedialDist[pointI].valid(dummyTrackData))
+                    forAll(meshPoints, i)
                     {
-                        maxPoints.append(pointI);
-                        maxInfo.append
-                        (
-                            pointData
+                        label pointI = meshPoints[i];
+                        if (!pointMedialDist[pointI].valid(dummyTrackData))
+                        {
+                            maxPoints.append(pointI);
+                            maxInfo.append
                             (
-                                points[pointI],
-                                0.0,
-                                pointI,         // passive data
-                                vector::zero    // passive data
-                            )
-                        );
-                        pointMedialDist[pointI] = maxInfo.last();
+                                pointData
+                                (
+                                    points[pointI],
+                                    0.0,
+                                    pointI,         // passive data
+                                    vector::zero    // passive data
+                                )
+                            );
+                            pointMedialDist[pointI] = maxInfo.last();
+                        }
+                    }
+                }
+                else
+                {
+                    // Based on geometry: analyse angle w.r.t. nearest moving
+                    // point. In the pointWallDist we transported the
+                    // normal as the passive vector. Note that this points
+                    // out of the originating wall so inside of the domain
+                    // on this patch.
+                    Info<< "Inserting points on patch " << pp.name()
+                        << " if angle to nearest layer patch > "
+                        << featureAngle << " degrees." << endl;
+
+                    scalar featureAngleCos = Foam::cos(degToRad(featureAngle));
+                    pointField pointNormals
+                    (
+                        PatchTools::pointNormals
+                        (
+                            mesh,
+                            pp,
+                            identity(pp.size())+pp.start()
+                        )
+                    );
+
+                    forAll(meshPoints, i)
+                    {
+                        label pointI = meshPoints[i];
+
+                        if (!pointMedialDist[pointI].valid(dummyTrackData))
+                        {
+                            // Check if angle not too large.
+                            scalar cosAngle =
+                            (
+                               -pointWallDist[pointI].v()
+                              & pointNormals[i]
+                            );
+                            if (cosAngle > featureAngleCos)
+                            {
+                                // Extrusion direction practically perpendicular
+                                // to the patch. Disable movement at the patch.
+
+                                maxPoints.append(pointI);
+                                maxInfo.append
+                                (
+                                    pointData
+                                    (
+                                        points[pointI],
+                                        0.0,
+                                        pointI,         // passive data
+                                        vector::zero    // passive data
+                                    )
+                                );
+                                pointMedialDist[pointI] = maxInfo.last();
+                            }
+                            else
+                            {
+                                // Extrusion direction makes angle with patch
+                                // so allow sliding - don't insert zero points
+                            }
+                        }
                     }
                 }
             }
@@ -1141,13 +1212,12 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
     // reduce thickness where thickness/medial axis distance large
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    autoPtr<OFstream> str;
-    label vertI = 0;
+    autoPtr<OBJstream> str;
     if (debug)
     {
         str.reset
         (
-            new OFstream
+            new OBJstream
             (
                 mesh.time().path()
               / "thicknessRatioExcludePoints_"
@@ -1159,13 +1229,12 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
             << str().name() << endl;
     }
 
-    autoPtr<OFstream> medialVecStr;
-    label medialVertI = 0;
+    autoPtr<OBJstream> medialVecStr;
     if (debug)
     {
         medialVecStr.reset
         (
-            new OFstream
+            new OBJstream
             (
                 mesh.time().path()
               / "thicknessRatioExcludeMedialVec_"
@@ -1227,21 +1296,19 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
                 if (str.valid())
                 {
                     const point& pt = mesh.points()[pointI];
-                    meshTools::writeOBJ(str(), pt);
-                    vertI++;
-                    meshTools::writeOBJ(str(), pt+patchDisp[patchPointI]);
-                    vertI++;
-                    str()<< "l " << vertI-1 << ' ' << vertI << nl;
+                    str().write(linePointRef(pt, pt+patchDisp[patchPointI]));
                 }
                 if (medialVecStr.valid())
                 {
                     const point& pt = mesh.points()[pointI];
-                    meshTools::writeOBJ(medialVecStr(), pt);
-                    medialVertI++;
-                    meshTools::writeOBJ(medialVecStr(), medialVec[pointI]);
-                    medialVertI++;
-                    medialVecStr()<< "l " << medialVertI-1
-                        << ' ' << medialVertI << nl;
+                    medialVecStr().write
+                    (
+                        linePointRef
+                        (
+                            pt,
+                            medialVec[pointI]
+                        )
+                    );
                 }
             }
         }

From 7d17731637b99d875cf168722b807dd37d8e516d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 1 Oct 2012 17:00:43 +0100
Subject: [PATCH 03/14] ChemistryModel: Updated names and lookup

---
 .../basicChemistryModelTemplates.C            | 10 ++---
 .../chemistryModel.C}                         | 38 +++++++++----------
 .../chemistryModel.H}                         | 28 +++++++-------
 .../chemistryModelI.H}                        | 12 +++---
 .../psiChemistryModel/psiChemistryModel.H     |  2 +-
 .../psiChemistryModel/psiChemistryModels.C    | 12 +++---
 .../rhoChemistryModel/rhoChemistryModel.H     |  2 +-
 .../rhoChemistryModel/rhoChemistryModels.C    | 12 +++---
 .../chemistrySolver/chemistrySolver.H         |  2 +-
 .../makeChemistrySolverTypes.H                | 17 ++++-----
 .../chemistryModel/chemistrySolver/ode/ode.C  |  2 +-
 .../chemFoam/gri/constant/chemistryProperties |  2 +-
 .../chemFoam/h2/constant/chemistryProperties  |  2 +-
 .../ic8h18/constant/chemistryProperties       |  2 +-
 .../nc7h16/constant/chemistryProperties       |  2 +-
 .../constant/chemistryProperties              |  2 +-
 .../constant/chemistryProperties              |  2 +-
 .../constant/chemistryProperties              |  2 +-
 .../constant/chemistryProperties              |  2 +-
 .../constant/chemistryProperties              |  2 +-
 .../cylinder/constant/chemistryProperties     |  2 +-
 .../hotBoxes/constant/chemistryProperties     |  2 +-
 .../rivuletPanel/constant/chemistryProperties |  2 +-
 .../splashPanel/constant/chemistryProperties  |  2 +-
 .../filter/constant/chemistryProperties       |  2 +-
 .../parcelInBox/constant/chemistryProperties  |  2 +-
 .../constant/chemistryProperties              |  2 +-
 .../aachenBomb/constant/chemistryProperties   |  2 +-
 28 files changed, 83 insertions(+), 88 deletions(-)
 rename src/thermophysicalModels/chemistryModel/chemistryModel/{ODEChemistryModel/ODEChemistryModel.C => chemistryModel/chemistryModel.C} (94%)
 rename src/thermophysicalModels/chemistryModel/chemistryModel/{ODEChemistryModel/ODEChemistryModel.H => chemistryModel/chemistryModel.H} (93%)
 rename src/thermophysicalModels/chemistryModel/chemistryModel/{ODEChemistryModel/ODEChemistryModelI.H => chemistryModel/chemistryModelI.H} (85%)

diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
index e842b4b27b..1632d68266 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
@@ -58,12 +58,11 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
 
         Info<< "Selecting chemistry type " << chemistryTypeDict << endl;
 
-        const int nCmpt = 8;
+        const int nCmpt = 7;
         const char* cmptNames[nCmpt] =
         {
             "chemistrySolver",
-            "chemistryModel",
-            "???ChemistryModel",
+            "chemistryThermo",
             "transport",
             "thermo",
             "equationOfState",
@@ -109,9 +108,8 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
         // Construct the name of the chemistry type from the components
         chemistryTypeName =
             word(chemistryTypeDict.lookup("chemistrySolver")) + '<'
-          + word(chemistryTypeDict.lookup("chemistryModel")) + '<'
-          + ChemistryModel::typeName + ','
-          + thermoTypeName + ">>";
+          + word(chemistryTypeDict.lookup("chemistryThermo")) + ','
+          + thermoTypeName + ">";
 
         typename ChemistryModel::fvMeshConstructorTable::iterator cstrIter =
             ChemistryModel::fvMeshConstructorTablePtr_->find(chemistryTypeName);
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
similarity index 94%
rename from src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
rename to src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index 522afe5161..f8ea434cf5 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -23,14 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "ODEChemistryModel.H"
+#include "chemistryModel.H"
 #include "chemistrySolver.H"
 #include "reactingMixture.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CompType, class ThermoType>
-Foam::ODEChemistryModel<CompType, ThermoType>::ODEChemistryModel
+Foam::chemistryModel<CompType, ThermoType>::chemistryModel
 (
     const fvMesh& mesh,
     const word& ODEModelName,
@@ -80,7 +80,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::ODEChemistryModel
         );
     }
 
-    Info<< "ODEChemistryModel: Number of species = " << nSpecie_
+    Info<< "chemistryModel: Number of species = " << nSpecie_
         << " and reactions = " << nReaction_ << endl;
 }
 
@@ -88,7 +88,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::ODEChemistryModel
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class CompType, class ThermoType>
-Foam::ODEChemistryModel<CompType, ThermoType>::~ODEChemistryModel()
+Foam::chemistryModel<CompType, ThermoType>::~chemistryModel()
 {}
 
 
@@ -96,7 +96,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::~ODEChemistryModel()
 
 template<class CompType, class ThermoType>
 Foam::tmp<Foam::scalarField>
-Foam::ODEChemistryModel<CompType, ThermoType>::omega
+Foam::chemistryModel<CompType, ThermoType>::omega
 (
     const scalarField& c,
     const scalar T,
@@ -138,7 +138,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::omega
 
 
 template<class CompType, class ThermoType>
-Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::omegaI
+Foam::scalar Foam::chemistryModel<CompType, ThermoType>::omegaI
 (
     const label index,
     const scalarField& c,
@@ -160,7 +160,7 @@ Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::omegaI
 
 
 template<class CompType, class ThermoType>
-void Foam::ODEChemistryModel<CompType, ThermoType>::updateConcsInReactionI
+void Foam::chemistryModel<CompType, ThermoType>::updateConcsInReactionI
 (
     const label index,
     const scalar dt,
@@ -189,7 +189,7 @@ void Foam::ODEChemistryModel<CompType, ThermoType>::updateConcsInReactionI
 
 
 template<class CompType, class ThermoType>
-void Foam::ODEChemistryModel<CompType, ThermoType>::updateRRInReactionI
+void Foam::chemistryModel<CompType, ThermoType>::updateRRInReactionI
 (
     const label index,
     const scalar pr,
@@ -220,7 +220,7 @@ void Foam::ODEChemistryModel<CompType, ThermoType>::updateRRInReactionI
 
 
 template<class CompType, class ThermoType>
-Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::omega
+Foam::scalar Foam::chemistryModel<CompType, ThermoType>::omega
 (
     const Reaction<ThermoType>& R,
     const scalarField& c,
@@ -338,7 +338,7 @@ Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::omega
 
 
 template<class CompType, class ThermoType>
-void Foam::ODEChemistryModel<CompType, ThermoType>::derivatives
+void Foam::chemistryModel<CompType, ThermoType>::derivatives
 (
     const scalar time,
     const scalarField &c,
@@ -389,7 +389,7 @@ void Foam::ODEChemistryModel<CompType, ThermoType>::derivatives
 
 
 template<class CompType, class ThermoType>
-void Foam::ODEChemistryModel<CompType, ThermoType>::jacobian
+void Foam::chemistryModel<CompType, ThermoType>::jacobian
 (
     const scalar t,
     const scalarField& c,
@@ -532,7 +532,7 @@ void Foam::ODEChemistryModel<CompType, ThermoType>::jacobian
 
 template<class CompType, class ThermoType>
 Foam::tmp<Foam::volScalarField>
-Foam::ODEChemistryModel<CompType, ThermoType>::tc() const
+Foam::chemistryModel<CompType, ThermoType>::tc() const
 {
     scalar pf, cf, pr, cr;
     label lRef, rRef;
@@ -615,7 +615,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::tc() const
 
 template<class CompType, class ThermoType>
 Foam::tmp<Foam::volScalarField>
-Foam::ODEChemistryModel<CompType, ThermoType>::Sh() const
+Foam::chemistryModel<CompType, ThermoType>::Sh() const
 {
     tmp<volScalarField> tSh
     (
@@ -657,7 +657,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::Sh() const
 
 template<class CompType, class ThermoType>
 Foam::tmp<Foam::volScalarField>
-Foam::ODEChemistryModel<CompType, ThermoType>::dQ() const
+Foam::chemistryModel<CompType, ThermoType>::dQ() const
 {
     tmp<volScalarField> tdQ
     (
@@ -689,7 +689,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::dQ() const
 
 
 template<class CompType, class ThermoType>
-Foam::label Foam::ODEChemistryModel<CompType, ThermoType>::nEqns() const
+Foam::label Foam::chemistryModel<CompType, ThermoType>::nEqns() const
 {
     // nEqns = number of species + temperature + pressure
     return nSpecie_ + 2;
@@ -697,7 +697,7 @@ Foam::label Foam::ODEChemistryModel<CompType, ThermoType>::nEqns() const
 
 
 template<class CompType, class ThermoType>
-void Foam::ODEChemistryModel<CompType, ThermoType>::calculate()
+void Foam::chemistryModel<CompType, ThermoType>::calculate()
 {
     if (!this->chemistry_)
     {
@@ -742,7 +742,7 @@ void Foam::ODEChemistryModel<CompType, ThermoType>::calculate()
 
 
 template<class CompType, class ThermoType>
-Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::solve
+Foam::scalar Foam::chemistryModel<CompType, ThermoType>::solve
 (
     const scalar t0,
     const scalar deltaT
@@ -833,7 +833,7 @@ Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::solve
 
 
 template<class CompType, class ThermoType>
-Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::solve
+Foam::scalar Foam::chemistryModel<CompType, ThermoType>::solve
 (
     scalarField &c,
     const scalar T,
@@ -844,7 +844,7 @@ Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::solve
 {
     notImplemented
     (
-        "ODEChemistryModel::solve"
+        "chemistryModel::solve"
         "("
             "scalarField&, "
             "const scalar, "
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
similarity index 93%
rename from src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H
rename to src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
index da560dae87..7cbb4f696e 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::ODEChemistryModel
+    Foam::chemistryModel
 
 Description
     Extends base chemistry model by adding a thermo package, and ODE functions.
@@ -30,13 +30,13 @@ Description
     terms.
 
 SourceFiles
-    ODEChemistryModelI.H
-    ODEChemistryModel.C
+    chemistryModelI.H
+    chemistryModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef ODEChemistryModel_H
-#define ODEChemistryModel_H
+#ifndef chemistryModel_H
+#define chemistryModel_H
 
 #include "Reaction.H"
 #include "ODE.H"
@@ -53,11 +53,11 @@ namespace Foam
 class fvMesh;
 
 /*---------------------------------------------------------------------------*\
-                      Class ODEChemistryModel Declaration
+                      Class chemistryModel Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CompType, class ThermoType>
-class ODEChemistryModel
+class chemistryModel
 :
     public CompType,
     public ODE
@@ -65,10 +65,10 @@ class ODEChemistryModel
     // Private Member Functions
 
         //- Disallow copy constructor
-        ODEChemistryModel(const ODEChemistryModel&);
+        chemistryModel(const chemistryModel&);
 
         //- Disallow default bitwise assignment
-        void operator=(const ODEChemistryModel&);
+        void operator=(const chemistryModel&);
 
 
 protected:
@@ -104,13 +104,13 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("ODEChemistryModel");
+    TypeName("chemistryModel");
 
 
     // Constructors
 
         //- Construct from components
-        ODEChemistryModel
+        chemistryModel
         (
             const fvMesh& mesh,
             const word& ODEModelName,
@@ -119,7 +119,7 @@ public:
 
 
     //- Destructor
-    virtual ~ODEChemistryModel();
+    virtual ~chemistryModel();
 
 
     // Member Functions
@@ -263,12 +263,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "ODEChemistryModelI.H"
+#include "chemistryModelI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ODEChemistryModel.C"
+#   include "chemistryModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModelI.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModelI.H
similarity index 85%
rename from src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModelI.H
rename to src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModelI.H
index 9f06a064a7..d128443fe9 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModelI.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModelI.H
@@ -30,7 +30,7 @@ License
 
 template<class CompType, class ThermoType>
 inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >&
-Foam::ODEChemistryModel<CompType, ThermoType>::RR()
+Foam::chemistryModel<CompType, ThermoType>::RR()
 {
     return RR_;
 }
@@ -38,7 +38,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::RR()
 
 template<class CompType, class ThermoType>
 inline const Foam::PtrList<Foam::Reaction<ThermoType> >&
-Foam::ODEChemistryModel<CompType, ThermoType>::reactions() const
+Foam::chemistryModel<CompType, ThermoType>::reactions() const
 {
     return reactions_;
 }
@@ -46,7 +46,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::reactions() const
 
 template<class CompType, class ThermoType>
 inline const Foam::PtrList<ThermoType>&
-Foam::ODEChemistryModel<CompType, ThermoType>::specieThermo() const
+Foam::chemistryModel<CompType, ThermoType>::specieThermo() const
 {
     return specieThermo_;
 }
@@ -54,7 +54,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::specieThermo() const
 
 template<class CompType, class ThermoType>
 inline Foam::label
-Foam::ODEChemistryModel<CompType, ThermoType>::nSpecie() const
+Foam::chemistryModel<CompType, ThermoType>::nSpecie() const
 {
     return nSpecie_;
 }
@@ -62,7 +62,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::nSpecie() const
 
 template<class CompType, class ThermoType>
 inline Foam::label
-Foam::ODEChemistryModel<CompType, ThermoType>::nReaction() const
+Foam::chemistryModel<CompType, ThermoType>::nReaction() const
 {
     return nReaction_;
 }
@@ -70,7 +70,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::nReaction() const
 
 template<class CompType, class ThermoType>
 inline const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::ODEChemistryModel<CompType, ThermoType>::RR
+Foam::chemistryModel<CompType, ThermoType>::RR
 (
     const label i
 ) const
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
index 0a269a3ce4..bb901aed7b 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
@@ -78,7 +78,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("psiChemistryModel");
+    TypeName("psi");
 
 
     //- Declare run-time constructor selection tables
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C
index cc271358cc..b4a973a708 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C
@@ -32,7 +32,7 @@ Description
 #include "makeChemistryModel.H"
 
 #include "psiChemistryModel.H"
-#include "ODEChemistryModel.H"
+#include "chemistryModel.H"
 #include "thermoPhysicsTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -41,35 +41,35 @@ namespace Foam
 {
     makeChemistryModel
     (
-        ODEChemistryModel,
+        chemistryModel,
         psiChemistryModel,
         constGasThermoPhysics
     );
 
     makeChemistryModel
     (
-        ODEChemistryModel,
+        chemistryModel,
         psiChemistryModel,
         gasThermoPhysics
     );
 
     makeChemistryModel
     (
-        ODEChemistryModel,
+        chemistryModel,
         psiChemistryModel,
         constIncompressibleGasThermoPhysics
     );
 
     makeChemistryModel
     (
-        ODEChemistryModel,
+        chemistryModel,
         psiChemistryModel,
         incompressibleGasThermoPhysics
     );
 
     makeChemistryModel
     (
-        ODEChemistryModel,
+        chemistryModel,
         psiChemistryModel,
         icoPoly8ThermoPhysics
     );
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
index 1e36ee19e4..8d82b860b5 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
@@ -78,7 +78,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("rhoChemistryModel");
+    TypeName("rho");
 
 
     //- Declare run-time constructor selection tables
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C
index 30488a6856..e5be84743c 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C
@@ -32,7 +32,7 @@ Description
 #include "makeChemistryModel.H"
 
 #include "rhoChemistryModel.H"
-#include "ODEChemistryModel.H"
+#include "chemistryModel.H"
 #include "thermoPhysicsTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -41,35 +41,35 @@ namespace Foam
 {
     makeChemistryModel
     (
-        ODEChemistryModel,
+        chemistryModel,
         rhoChemistryModel,
         constGasThermoPhysics
     );
 
     makeChemistryModel
     (
-        ODEChemistryModel,
+        chemistryModel,
         rhoChemistryModel,
         gasThermoPhysics
     );
 
     makeChemistryModel
     (
-        ODEChemistryModel,
+        chemistryModel,
         rhoChemistryModel,
         constIncompressibleGasThermoPhysics
     );
 
     makeChemistryModel
     (
-        ODEChemistryModel,
+        chemistryModel,
         rhoChemistryModel,
         incompressibleGasThermoPhysics
     );
 
     makeChemistryModel
     (
-        ODEChemistryModel,
+        chemistryModel,
         rhoChemistryModel,
         icoPoly8ThermoPhysics
     );
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
index dfbb29ecd0..0738ef8e52 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef chemistrySolver_H
 #define chemistrySolver_H
 
-#include "ODEChemistryModel.H"
+#include "chemistryModel.H"
 #include "IOdictionary.H"
 #include "scalarField.H"
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
index f9ab5839c3..e110388daa 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
@@ -28,7 +28,7 @@ License
 
 #include "chemistrySolver.H"
 
-#include "ODEChemistryModel.H"
+#include "chemistryModel.H"
 
 #include "noChemistrySolver.H"
 #include "EulerImplicit.H"
@@ -37,21 +37,22 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeChemistrySolverType(SS, ODEChem, Comp, Thermo)                    \
+#define makeChemistrySolverType(SS, Comp, Thermo)                             \
                                                                               \
-    typedef SS<ODEChem<Comp, Thermo> > SS##ODEChem##Comp##Thermo;             \
+    typedef SS<chemistryModel<Comp, Thermo> > SS##Comp##Thermo;               \
                                                                               \
     defineTemplateTypeNameAndDebugWithName                                    \
     (                                                                         \
-        SS##ODEChem##Comp##Thermo,                                            \
-        (#SS"<"#ODEChem"<"#Comp"," + Thermo::typeName() + ">>").c_str(),      \
+        SS##Comp##Thermo,                                                     \
+        (#SS"<" + word(Comp::typeName_())                                     \
+      + "," + Thermo::typeName() + ">").c_str(),                              \
         0                                                                     \
     );                                                                        \
                                                                               \
     addToRunTimeSelectionTable                                                \
     (                                                                         \
         Comp,                                                                 \
-        SS##ODEChem##Comp##Thermo,                                            \
+        SS##Comp##Thermo,                                                     \
         fvMesh                                                                \
     );
 
@@ -61,7 +62,6 @@ License
     makeChemistrySolverType                                                   \
     (                                                                         \
         noChemistrySolver,                                                    \
-        ODEChemistryModel,                                                    \
         CompChemModel,                                                        \
         Thermo                                                                \
     );                                                                        \
@@ -69,7 +69,6 @@ License
     makeChemistrySolverType                                                   \
     (                                                                         \
         EulerImplicit,                                                        \
-        ODEChemistryModel,                                                    \
         CompChemModel,                                                        \
         Thermo                                                                \
     );                                                                        \
@@ -77,7 +76,6 @@ License
     makeChemistrySolverType                                                   \
     (                                                                         \
         ode,                                                                  \
-        ODEChemistryModel,                                                    \
         CompChemModel,                                                        \
         Thermo                                                                \
     );                                                                        \
@@ -85,7 +83,6 @@ License
     makeChemistrySolverType                                                   \
     (                                                                         \
         sequential,                                                           \
-        ODEChemistryModel,                                                    \
         CompChemModel,                                                        \
         Thermo                                                                \
     );
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
index 7e2b44bc83..c9e9054f0e 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ode.H"
-#include "ODEChemistryModel.H"
+#include "chemistryModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
index 65f5b0ac6d..0bd6848bf9 100644
--- a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   ode;
+    chemistryThermo   psi;
 }
 
 chemistry       on;
diff --git a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
index b0ebc946d4..2432cee770 100644
--- a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   ode;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       on;
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
index 07d0e5d36e..e9e8c9710e 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   ode;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       on;
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
index 277f2632be..23539f52b8 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   ode;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       on;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
index 103c36caab..4f1646c684 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   noChemistrySolver;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       off;
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
index 068c1b3f46..8990fd6754 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   ode;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry           on;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties
index 2f8eb06d2b..bd3fb3bdf4 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   noChemistrySolver;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry           on; // off;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties
index 275a88b8d6..89d5dba768 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   noChemistrySolver;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
index aed335d273..f1e56f1613 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   ode;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       on;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
index c0ecd63722..47457f208f 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   noChemistrySolver;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
index c0ecd63722..47457f208f 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   noChemistrySolver;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
index c0ecd63722..47457f208f 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   noChemistrySolver;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
index c0ecd63722..47457f208f 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   noChemistrySolver;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
index 40cf4f3f12..d0db53e938 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   ode;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
index 40cf4f3f12..d0db53e938 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   ode;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
index 40cf4f3f12..d0db53e938 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   ode;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
index fcf49a0f81..1f5641dfd8 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
@@ -17,8 +17,8 @@ FoamFile
 
 chemistryType
 {
-    chemistryModel    ODEChemistryModel;
     chemistrySolver   ode;
+    chemistryThermo   psiChemistryModel;
 }
 
 chemistry       off;

From a9894b5161f7414b81f82afeee5f64faef0941a1 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 1 Oct 2012 17:00:56 +0100
Subject: [PATCH 04/14] Updated headers

---
 .../chemistrySolver/chemistrySolver/chemistrySolver.H           | 2 +-
 .../chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H  | 2 +-
 .../chemistryModel/chemistrySolver/ode/ode.C                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
index 0738ef8e52..32deb38491 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
index e110388daa..4660dcd17a 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
index c9e9054f0e..18070b565d 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 88050abcabac90dc37aee125229191e327abcc02 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 2 Oct 2012 11:33:04 +0100
Subject: [PATCH 05/14] ChemistryModel: the from of the compressibility thermo
 is now selectable

The form of the chemistry model is no longer selectable (only one choice).
---
 .../basicChemistryModelTemplates.C             |  6 ++----
 .../chemistryModel/chemistryModel.C            |  6 ++----
 .../chemistryModel/chemistryModel.H            |  9 ++-------
 .../psiChemistryModel/psiChemistryModel.C      |  3 +--
 .../psiChemistryModel/psiChemistryModel.H      | 10 +++-------
 .../rhoChemistryModel/rhoChemistryModel.C      |  3 +--
 .../rhoChemistryModel/rhoChemistryModel.H      |  8 +++-----
 .../EulerImplicit/EulerImplicit.C              | 18 ++++++++----------
 .../EulerImplicit/EulerImplicit.H              | 13 ++++---------
 .../chemistrySolver/chemistrySolver.C          | 15 ++++++---------
 .../chemistrySolver/chemistrySolver.H          | 18 +++---------------
 .../noChemistrySolver/noChemistrySolver.C      | 18 ++++++++----------
 .../noChemistrySolver/noChemistrySolver.H      | 12 +++---------
 .../chemistryModel/chemistrySolver/ode/ode.C   | 18 ++++++++----------
 .../chemistryModel/chemistrySolver/ode/ode.H   | 15 +++++----------
 .../chemistrySolver/sequential/sequential.C    | 18 ++++++++----------
 .../chemistrySolver/sequential/sequential.H    | 14 ++++----------
 .../ODESolidChemistryModel.C                   |  6 ++----
 .../ODESolidChemistryModel.H                   |  9 ++-------
 .../solidChemistryModel/solidChemistryModel.C  |  5 ++---
 .../solidChemistryModel/solidChemistryModel.H  | 16 ++++------------
 .../solidChemistryModelNew.C                   |  3 +--
 .../chemFoam/h2/constant/chemistryProperties   |  2 +-
 .../ic8h18/constant/chemistryProperties        |  2 +-
 .../nc7h16/constant/chemistryProperties        |  2 +-
 .../constant/chemistryProperties               |  2 +-
 .../constant/chemistryProperties               |  2 +-
 .../constant/chemistryProperties               |  2 +-
 .../constant/chemistryProperties               |  2 +-
 .../constant/chemistryProperties               |  2 +-
 .../cylinder/constant/chemistryProperties      |  2 +-
 .../hotBoxes/constant/chemistryProperties      |  2 +-
 .../rivuletPanel/constant/chemistryProperties  |  2 +-
 .../splashPanel/constant/chemistryProperties   |  2 +-
 .../filter/constant/chemistryProperties        |  2 +-
 .../parcelInBox/constant/chemistryProperties   |  2 +-
 .../constant/chemistryProperties               |  2 +-
 .../aachenBomb/constant/chemistryProperties    |  2 +-
 38 files changed, 98 insertions(+), 177 deletions(-)

diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
index 1632d68266..7e20960210 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
@@ -158,8 +158,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
             FatalError<< exit(FatalError);
         }
 
-        return autoPtr<ChemistryModel>
-            (cstrIter()(mesh, typeName, chemistryTypeName));
+        return autoPtr<ChemistryModel>(cstrIter()(mesh));
     }
     else
     {
@@ -181,8 +180,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
                 << exit(FatalError);
         }
 
-        return autoPtr<ChemistryModel>
-            (cstrIter()(mesh, typeName, chemistryTypeName));
+        return autoPtr<ChemistryModel>(cstrIter()(mesh));
     }
 }
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index f8ea434cf5..c53c6e20cb 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -32,12 +32,10 @@ License
 template<class CompType, class ThermoType>
 Foam::chemistryModel<CompType, ThermoType>::chemistryModel
 (
-    const fvMesh& mesh,
-    const word& ODEModelName,
-    const word& thermoTypeName
+    const fvMesh& mesh
 )
 :
-    CompType(mesh, thermoTypeName),
+    CompType(mesh),
 
     ODE(),
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
index 7cbb4f696e..b663769d2a 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
@@ -109,13 +109,8 @@ public:
 
     // Constructors
 
-        //- Construct from components
-        chemistryModel
-        (
-            const fvMesh& mesh,
-            const word& ODEModelName,
-            const word& thermoTypeName
-        );
+        //- Construct from mesh
+        chemistryModel(const fvMesh& mesh);
 
 
     //- Destructor
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
index 933dd952ba..a9e9a08089 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
@@ -39,8 +39,7 @@ namespace Foam
 
 Foam::psiChemistryModel::psiChemistryModel
 (
-    const fvMesh& mesh,
-    const word& thermoTypeName
+    const fvMesh& mesh
 )
 :
     basicChemistryModel(mesh),
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
index bb901aed7b..d214a6912a 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
@@ -87,19 +87,15 @@ public:
         autoPtr,
         psiChemistryModel,
         fvMesh,
-        (
-            const fvMesh& mesh,
-            const word& compTypeName,
-            const word& thermoTypeName
-        ),
-        (mesh, compTypeName, thermoTypeName)
+        (const fvMesh& mesh),
+        (mesh)
     );
 
 
     // Constructors
 
         //- Construct from mesh
-        psiChemistryModel(const fvMesh& mesh, const word& thermoTypeName);
+        psiChemistryModel(const fvMesh& mesh);
 
 
     //- Selector
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
index f8b033d68a..f3ff557e39 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
@@ -39,8 +39,7 @@ namespace Foam
 
 Foam::rhoChemistryModel::rhoChemistryModel
 (
-    const fvMesh& mesh,
-    const word& thermoTypeName
+    const fvMesh& mesh
 )
 :
     basicChemistryModel(mesh),
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
index 8d82b860b5..94c66733e3 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
@@ -88,18 +88,16 @@ public:
         rhoChemistryModel,
         fvMesh,
         (
-            const fvMesh& mesh,
-            const word& compTypeName,
-            const word& thermoTypeName
+            const fvMesh& mesh
         ),
-        (mesh, compTypeName, thermoTypeName)
+        (mesh)
     );
 
 
     // Constructors
 
         //- Construct from mesh
-        rhoChemistryModel(const fvMesh& mesh, const word& thermoTypeName);
+        rhoChemistryModel(const fvMesh& mesh);
 
 
     //- Selector
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
index 983b56d6ae..f0394a1c69 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
@@ -29,15 +29,13 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::EulerImplicit<ODEChemistryType>::EulerImplicit
+template<class ChemistryModel>
+Foam::EulerImplicit<ChemistryModel>::EulerImplicit
 (
-    const fvMesh& mesh,
-    const word& ODEModelName,
-    const word& thermoType
+    const fvMesh& mesh
 )
 :
-    chemistrySolver<ODEChemistryType>(mesh, ODEModelName, thermoType),
+    chemistrySolver<ChemistryModel>(mesh),
     coeffsDict_(this->subDict("EulerImplicitCoeffs")),
     cTauChem_(readScalar(coeffsDict_.lookup("cTauChem"))),
     eqRateLimiter_(coeffsDict_.lookup("equilibriumRateLimiter"))
@@ -46,15 +44,15 @@ Foam::EulerImplicit<ODEChemistryType>::EulerImplicit
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::EulerImplicit<ODEChemistryType>::~EulerImplicit()
+template<class ChemistryModel>
+Foam::EulerImplicit<ChemistryModel>::~EulerImplicit()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::scalar Foam::EulerImplicit<ODEChemistryType>::solve
+template<class ChemistryModel>
+Foam::scalar Foam::EulerImplicit<ChemistryModel>::solve
 (
     scalarField &c,
     const scalar T,
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
index 7473c036ef..42f192b38f 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
@@ -46,10 +46,10 @@ namespace Foam
                        Class EulerImplicit Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ODEChemistryType>
+template<class ChemistryModel>
 class EulerImplicit
 :
-    public chemistrySolver<ODEChemistryType>
+    public chemistrySolver<ChemistryModel>
 {
     // Private data
 
@@ -74,13 +74,8 @@ public:
 
     // Constructors
 
-        //- Construct from components
-        EulerImplicit
-        (
-            const fvMesh& mesh,
-            const word& ODEmodelName,
-            const word& thermoType
-        );
+        //- Construct from mesh
+        EulerImplicit(const fvMesh& mesh);
 
 
     //- Destructor
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C
index 960c7d3010..40459010be 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C
@@ -27,23 +27,20 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::chemistrySolver<ODEChemistryType>::chemistrySolver
+template<class ChemistryModel>
+Foam::chemistrySolver<ChemistryModel>::chemistrySolver
 (
-    const fvMesh& mesh,
-    const word& ODEModelName,
-    const word& thermoType
+    const fvMesh& mesh
 )
 :
-    ODEChemistryType(mesh, ODEModelName, thermoType),
-    name_(ODEModelName)
+    ChemistryModel(mesh)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::chemistrySolver<ODEChemistryType>::~chemistrySolver()
+template<class ChemistryModel>
+Foam::chemistrySolver<ChemistryModel>::~chemistrySolver()
 {}
 
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
index 32deb38491..574a808383 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
@@ -48,30 +48,18 @@ namespace Foam
                       Class chemistrySolver Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ODEChemistryType>
+template<class ChemistryModel>
 class chemistrySolver
 :
-    public ODEChemistryType
+    public ChemistryModel
 {
-protected:
-
-    // Protected data
-
-        //- Name of the chemistry solver
-        const word name_;
-
 
 public:
 
     // Constructors
 
         //- Construct from components
-        chemistrySolver
-        (
-            const fvMesh& mesh,
-            const word& ODEModelName,
-            const word& thermoType
-        );
+        chemistrySolver(const fvMesh& mesh);
 
 
     //- Destructor
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C
index a708f92b87..efc8c10735 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C
@@ -28,29 +28,27 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::noChemistrySolver<ODEChemistryType>::noChemistrySolver
+template<class ChemistryModel>
+Foam::noChemistrySolver<ChemistryModel>::noChemistrySolver
 (
-    const fvMesh& mesh,
-    const word& ODEModelName,
-    const word& thermoType
+    const fvMesh& mesh
 )
 :
-    chemistrySolver<ODEChemistryType>(mesh, ODEModelName, thermoType)
+    chemistrySolver<ChemistryModel>(mesh)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::noChemistrySolver<ODEChemistryType>::~noChemistrySolver()
+template<class ChemistryModel>
+Foam::noChemistrySolver<ChemistryModel>::~noChemistrySolver()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::scalar Foam::noChemistrySolver<ODEChemistryType>::solve
+template<class ChemistryModel>
+Foam::scalar Foam::noChemistrySolver<ChemistryModel>::solve
 (
     scalarField&,
     const scalar,
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H
index b46f59927e..2a84bac414 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H
@@ -47,10 +47,10 @@ namespace Foam
                      Class noChemistrySolver Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ODEChemistryType>
+template<class ChemistryModel>
 class noChemistrySolver
 :
-    public chemistrySolver<ODEChemistryType>
+    public chemistrySolver<ChemistryModel>
 {
 
 public:
@@ -61,14 +61,8 @@ public:
 
     // Constructors
 
-
         //- Construct from components
-        noChemistrySolver
-        (
-            const fvMesh& mesh,
-            const word& ODEModelName,
-            const word& thermoType
-        );
+        noChemistrySolver(const fvMesh& mesh);
 
 
     //- Destructor
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
index 18070b565d..aff5be67ca 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
@@ -28,15 +28,13 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::ode<ODEChemistryType>::ode
+template<class ChemistryModel>
+Foam::ode<ChemistryModel>::ode
 (
-    const fvMesh& mesh,
-    const word& ODEModelName,
-    const word& thermoType
+    const fvMesh& mesh
 )
 :
-    chemistrySolver<ODEChemistryType>(mesh, ODEModelName, thermoType),
+    chemistrySolver<ChemistryModel>(mesh),
     coeffsDict_(this->subDict("odeCoeffs")),
     solverName_(coeffsDict_.lookup("solver")),
     odeSolver_(ODESolver::New(solverName_, *this)),
@@ -46,15 +44,15 @@ Foam::ode<ODEChemistryType>::ode
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::ode<ODEChemistryType>::~ode()
+template<class ChemistryModel>
+Foam::ode<ChemistryModel>::~ode()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::scalar Foam::ode<ODEChemistryType>::solve
+template<class ChemistryModel>
+Foam::scalar Foam::ode<ChemistryModel>::solve
 (
     scalarField& c,
     const scalar T,
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
index 8da878f6ff..0357ff13be 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
@@ -47,10 +47,10 @@ namespace Foam
                             Class ode Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ODEChemistryType>
+template<class ChemistryModel>
 class ode
 :
-    public chemistrySolver<ODEChemistryType>
+    public chemistrySolver<ChemistryModel>
 {
     // Private data
 
@@ -66,18 +66,13 @@ class ode
 public:
 
     //- Runtime type information
-    TypeName("ODE");
+    TypeName("ode");
 
 
     // Constructors
 
-        //- Construct from components
-        ode
-        (
-            const fvMesh& mesh,
-            const word& ODEModeNewlName,
-            const word& thermoType
-        );
+        //- Construct from mesh
+        ode(const fvMesh& mesh);
 
 
     //- Destructor
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
index fa773944bd..defef83418 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
@@ -28,15 +28,13 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::sequential<ODEChemistryType>::sequential
+template<class ChemistryModel>
+Foam::sequential<ChemistryModel>::sequential
 (
-    const fvMesh& mesh,
-    const word& ODEModelName,
-    const word& thermoType
+    const fvMesh& mesh
 )
 :
-    chemistrySolver<ODEChemistryType>(mesh, ODEModelName, thermoType),
+    chemistrySolver<ChemistryModel>(mesh),
     coeffsDict_(this->subDict("sequentialCoeffs")),
     cTauChem_(readScalar(coeffsDict_.lookup("cTauChem"))),
     eqRateLimiter_(coeffsDict_.lookup("equilibriumRateLimiter"))
@@ -45,15 +43,15 @@ Foam::sequential<ODEChemistryType>::sequential
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::sequential<ODEChemistryType>::~sequential()
+template<class ChemistryModel>
+Foam::sequential<ChemistryModel>::~sequential()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ODEChemistryType>
-Foam::scalar Foam::sequential<ODEChemistryType>::solve
+template<class ChemistryModel>
+Foam::scalar Foam::sequential<ChemistryModel>::solve
 (
     scalarField &c,
     const scalar T,
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H
index a8d05e7ffe..b13273590e 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H
@@ -48,17 +48,16 @@ namespace Foam
                          Class sequential Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ODEChemistryType>
+template<class ChemistryModel>
 class sequential
 :
-    public chemistrySolver<ODEChemistryType>
+    public chemistrySolver<ChemistryModel>
 {
     // Private data
 
         //- Coefficients dictionary
         dictionary coeffsDict_;
 
-
         // Model constants
 
             //- Chemistry time scale
@@ -76,13 +75,8 @@ public:
 
     // Constructors
 
-        //- Construct from components
-        sequential
-        (
-            const fvMesh& mesh,
-            const word& ODEModelName,
-            const word& thermoType
-        );
+        //- Construct from mesh
+        sequential(const fvMesh& mesh);
 
 
     //- Destructor
diff --git a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
index 23ad0e62a0..e4d6d974b1 100644
--- a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
@@ -32,12 +32,10 @@ template<class CompType, class SolidThermo, class GasThermo>
 Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::
 ODESolidChemistryModel
 (
-    const fvMesh& mesh,
-    const word& compTypeName,
-    const word& solidThermoName
+    const fvMesh& mesh
 )
 :
-    CompType(mesh, solidThermoName),
+    CompType(mesh),
     ODE(),
     Ys_(this->solid().composition().Y()),
     pyrolisisGases_
diff --git a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.H
index df48750381..796d055388 100644
--- a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.H
@@ -138,13 +138,8 @@ public:
 
     // Constructors
 
-        //- Construct from components
-        ODESolidChemistryModel
-        (
-            const fvMesh& mesh,
-            const word& compTypeName,
-            const word& SolidThermoName
-        );
+        //- Construct from mesh
+        ODESolidChemistryModel(const fvMesh& mesh);
 
 
     //- Destructor
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
index b42d2e7fe6..fc5a7ced8c 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
@@ -39,12 +39,11 @@ namespace Foam
 
 Foam::solidChemistryModel::solidChemistryModel
 (
-    const fvMesh& mesh,
-    const word& solidThermoTypeName
+    const fvMesh& mesh
 )
 :
     basicChemistryModel(mesh),
-    solidThermo_(solidReactionThermo::New(mesh)) //, thermoTypeName))
+    solidThermo_(solidReactionThermo::New(mesh))
 {}
 
 
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
index d9580162ef..165188506c 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
@@ -88,23 +88,15 @@ public:
         autoPtr,
         solidChemistryModel,
         fvMesh,
-        (
-            const fvMesh& mesh,
-            const word& compTypeName,
-            const word& solidThermoTypeName
-        ),
-        (mesh, compTypeName, solidThermoTypeName)
+        (const fvMesh& mesh),
+        (mesh)
     );
 
 
     // Constructors
 
-        //- Construct from mesh and thermo type name
-        solidChemistryModel
-        (
-            const fvMesh& mesh,
-            const word& solidThermoTypeName
-        );
+        //- Construct from mesh
+        solidChemistryModel(const fvMesh& mesh);
 
 
     //- Selector
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C
index 0049237777..761e2ae22d 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C
@@ -104,8 +104,7 @@ Foam::autoPtr<Foam::solidChemistryModel> Foam::solidChemistryModel::New
         }
     }
 
-    return autoPtr<solidChemistryModel>
-        (cstrIter()(mesh, ODEModelName, thermoTypeName));
+    return autoPtr<solidChemistryModel>(cstrIter()(mesh));
 }
 
 
diff --git a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
index 2432cee770..b08455efb4 100644
--- a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   ode;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry       on;
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
index e9e8c9710e..0f13184b2f 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   ode;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry       on;
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
index 23539f52b8..50aebd8dce 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   ode;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry       on;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
index 4f1646c684..62fbf8fb24 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry       off;
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
index 8990fd6754..3ce48f2eab 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   ode;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry           on;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties
index bd3fb3bdf4..254f5c4633 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   rho;
 }
 
 chemistry           on; // off;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties
index 89d5dba768..0fbd9de5dc 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
index f1e56f1613..e0706fc235 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   ode;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry       on;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
index 47457f208f..8fbc88a1b3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
index 47457f208f..8fbc88a1b3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
index 47457f208f..8fbc88a1b3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
index 47457f208f..8fbc88a1b3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
index d0db53e938..5aa51f0290 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   ode;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
index d0db53e938..5aa51f0290 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   ode;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
index d0db53e938..5aa51f0290 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   ode;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
index 1f5641dfd8..deb5491013 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   ode;
-    chemistryThermo   psiChemistryModel;
+    chemistryThermo   psi;
 }
 
 chemistry       off;

From 416940ed3343193fb8283e9d768b86c36e4b3e88 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 2 Oct 2012 16:19:41 +0100
Subject: [PATCH 06/14] BUG: mergeMeshes: overwrite write to 0, not constant

---
 .../mesh/manipulation/mergeMeshes/mergeMeshes.C       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index 3841e16bf3..98304abf41 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,6 +115,7 @@ int main(int argc, char *argv[])
             runTimeMaster
         )
     );
+    const word oldInstance = masterMesh.pointsInstance();
 
 
     Info<< "Reading mesh to add for time = " << runTimeToAdd.timeName() << nl;
@@ -139,7 +140,13 @@ int main(int argc, char *argv[])
 
     masterMesh.addMesh(meshToAdd);
     masterMesh.merge();
-    masterMesh.polyMesh::write();
+
+    if (overwrite)
+    {
+        masterMesh.setInstance(oldInstance);
+    }
+
+    masterMesh.write();
 
     Info<< "\nEnd\n" << endl;
 

From f280cd933bacc5643d4f76a6a99309e4ba296734 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 3 Oct 2012 12:57:23 +0100
Subject: [PATCH 07/14] BUG: solidReactionThermo: incorrect name for runtime
 selection table

---
 .../solidThermo/solidReactionThermo/solidReactionThermo.C | 2 +-
 .../solidThermo/solidReactionThermo/solidReactionThermo.H | 2 +-
 .../solidReactionThermo/solidReactionThermoNew.C          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C
index 00f75ac7cc..b0f985f2f3 100644
--- a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C
@@ -31,7 +31,7 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(solidReactionThermo, 0);
-    defineRunTimeSelectionTable(solidReactionThermo, mesh);
+    defineRunTimeSelectionTable(solidReactionThermo, fvMesh);
     defineRunTimeSelectionTable(solidReactionThermo, dictionary);
 }
 
diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.H b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.H
index 6aa8a76047..e9112602e1 100644
--- a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.H
@@ -66,7 +66,7 @@ public:
     (
         autoPtr,
         solidReactionThermo,
-        mesh,
+        fvMesh,
         (const fvMesh& mesh),
         (mesh)
     );
diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C
index 6ef34f0e76..38d044c9f1 100644
--- a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C
+++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C
@@ -53,16 +53,16 @@ Foam::autoPtr<Foam::solidReactionThermo> Foam::solidReactionThermo::New
 
     Info<< "Selecting thermodynamics package " << modelType << endl;
 
-    meshConstructorTable::iterator cstrIter =
-        meshConstructorTablePtr_->find(modelType);
+    fvMeshConstructorTable::iterator cstrIter =
+        fvMeshConstructorTablePtr_->find(modelType);
 
-    if (cstrIter == meshConstructorTablePtr_->end())
+    if (cstrIter == fvMeshConstructorTablePtr_->end())
     {
         FatalErrorIn("solidReactionThermo::New(const fvMesh&)")
             << "Unknown solidReactionThermo type "
             << modelType << nl << nl
             << "Valid solidReactionThermo types:" << nl
-            << meshConstructorTablePtr_->sortedToc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 

From cf93009c5c23a0ef64433258e88835aea7836b75 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 3 Oct 2012 14:06:23 +0100
Subject: [PATCH 08/14] ENH: error: added printStack using std:: io

---
 src/OSspecific/POSIX/printStack.C | 22 +++++++++++++++++++++-
 src/OpenFOAM/db/error/error.H     |  6 +++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/OSspecific/POSIX/printStack.C b/src/OSspecific/POSIX/printStack.C
index df31b35f7b..4a3859dcae 100644
--- a/src/OSspecific/POSIX/printStack.C
+++ b/src/OSspecific/POSIX/printStack.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -167,6 +167,26 @@ void getSymbolForRaw
 }
 
 
+void error::safePrintStack(std::ostream& os)
+{
+    // Get raw stack symbols
+    void *array[100];
+    size_t size = backtrace(array, 100);
+    char **strings = backtrace_symbols(array, size);
+
+    // See if they contain function between () e.g. "(__libc_start_main+0xd0)"
+    // and see if cplus_demangle can make sense of part before +
+    for (size_t i = 0; i < size; i++)
+    {
+        string msg(strings[i]);
+        fileName programFile;
+        word address;
+
+        os  << '#' << label(i) << '\t' << msg << std::endl;
+    }
+}
+
+
 void error::printStack(Ostream& os)
 {
     // Reads the starting addresses for the dynamically linked libraries
diff --git a/src/OpenFOAM/db/error/error.H b/src/OpenFOAM/db/error/error.H
index ea599b6550..8216f5f71f 100644
--- a/src/OpenFOAM/db/error/error.H
+++ b/src/OpenFOAM/db/error/error.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,6 +162,10 @@ public:
         operator dictionary() const;
 
 
+        //- Helper function to print a stack (if OpenFOAM IO not yet
+        //  initialised)
+        static void safePrintStack(std::ostream&);
+
         //- Helper function to print a stack
         static void printStack(Ostream&);
 

From bf5e0376bedf165437ec4631dbcc0fe143ac2d7f Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 3 Oct 2012 14:06:59 +0100
Subject: [PATCH 09/14] STYLE: ISstream: corrected file list

---
 src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
index a45a784c60..9e1bb29610 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,8 +29,7 @@ Description
 
 SourceFiles
     ISstreamI.H
-    ISread.C
-    ISreadToken.C
+    ISstream.C
 
 \*---------------------------------------------------------------------------*/
 

From af4f1f42e5a2a8b64d9021a2ae0574cf5b3b376c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 3 Oct 2012 14:07:43 +0100
Subject: [PATCH 10/14] ENH: pointPatchField: added fixesValue

---
 .../basic/fixedValue/fixedValuePointPatchField.H    | 13 ++++++++++++-
 .../pointPatchField/pointPatchField.H               |  8 +++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
index 5c8f1466bd..d739bc239f 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,6 +121,17 @@ public:
         }
 
 
+    // Member functions
+
+        // Access
+
+            //- Return true if this patch field fixes a value
+            virtual bool fixesValue() const
+            {
+                return true;
+            }
+
+
     // Member operators
 
         // Disable assignment operators
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 5c3b19d8e7..39b1c9e551 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -278,6 +278,12 @@ public:
                 return internalField_;
             }
 
+            //- Return true if this patch field fixes a value
+            virtual bool fixesValue() const
+            {
+                return false;
+            }
+
             //- Return true if this patch field is coupled
             virtual bool coupled() const
             {

From 5fae67d2f18c5a8557daab5b7ab4e54b1edb2eeb Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 3 Oct 2012 14:35:44 +0100
Subject: [PATCH 11/14] ENH: autoSnapDriver: do not correct attraction

---
 .../autoHexMeshDriver/autoSnapDriver.H        |  18 +
 .../autoHexMeshDriver/autoSnapDriverFeature.C | 378 ++++++++++--------
 .../meshRefinement/meshRefinementRefine.C     |   3 +-
 3 files changed, 240 insertions(+), 159 deletions(-)

diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
index 9431f9b751..bd5dd86188 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
@@ -178,6 +178,24 @@ class autoSnapDriver
                     vector& edgeOffset  // offset from pt to point on edge
                 ) const;
 
+
+                //- For any reverse (so from feature back to mesh) attraction:
+                //  add attraction if diagonal points on face attracted
+                void stringFeatureEdges
+                (
+                    const label iter,
+                    const scalar featureCos,
+
+                    const indirectPrimitivePatch& pp,
+                    const scalarField& snapDist,
+
+                    const vectorField& rawPatchAttraction,
+                    const List<pointConstraint>& rawPatchConstraints,
+
+                    vectorField& patchAttraction,
+                    List<pointConstraint>& patchConstraints
+                ) const;
+
                 //- Return hit if on multiple points
                 pointIndexHit findMultiPatchPoint
                 (
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index 88ec55b1c8..7124875465 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -848,17 +848,17 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
         vector d = r.refPoint()-pt;
         d -= (d&n)*n;
 
-        // Correct for attraction to non-dominant face
-        correctAttraction
-        (
-            surfacePoints,
-            surfaceCount,
-            r.refPoint(),
-            n,                  // normalised normal
-            pt,
-
-            d                   // perpendicular offset vector
-        );
+        //// Correct for attraction to non-dominant face
+        //correctAttraction
+        //(
+        //    surfacePoints,
+        //    surfaceCount,
+        //    r.refPoint(),
+        //    n,                  // normalised normal
+        //    pt,
+        //
+        //    d                   // perpendicular offset vector
+        //);
 
         // Trim to snap distance
         if (magSqr(d) > sqr(snapDist[pointI]))
@@ -893,6 +893,15 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
         patchConstraint.applyConstraint(surfaceNormals[0]);
         patchConstraint.applyConstraint(surfaceNormals[1]);
         patchConstraint.applyConstraint(surfaceNormals[2]);
+
+        //Pout<< "# Feature point " << pt << nl;
+        //meshTools::writeOBJ(Pout, pt);
+        //meshTools::writeOBJ(Pout, surfacePoints[0]);
+        //meshTools::writeOBJ(Pout, surfacePoints[1]);
+        //meshTools::writeOBJ(Pout, surfacePoints[2]);
+        //Pout<< "l 1 2" << nl
+        //    << "l 1 3" << nl
+        //    << "l 1 4" << nl;
     }
 }
 
@@ -1001,6 +1010,195 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 }
 
 
+void Foam::autoSnapDriver::stringFeatureEdges
+(
+    const label iter,
+    const scalar featureCos,
+
+    const indirectPrimitivePatch& pp,
+    const scalarField& snapDist,
+
+    const vectorField& rawPatchAttraction,
+    const List<pointConstraint>& rawPatchConstraints,
+
+    vectorField& patchAttraction,
+    List<pointConstraint>& patchConstraints
+) const
+{
+    // Snap edges to feature edges
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Walk existing edges and snap remaining ones (that are marked as
+    // feature edges in rawPatchConstraints)
+
+    // What this does is fill in any faces where not all points
+    // on the face are being attracted:
+    /*
+           +
+          / \
+         /   \
+      ---+    +---
+         \   /
+          \ /
+           +
+    */
+    // so the top and bottom will never get attracted since the nearest
+    // back from the feature edge will always be one of the left or right
+    // points since the face is diamond like. So here we walk the feature edges
+    // and add any non-attracted points.
+
+
+    while (true)
+    {
+        label nChanged = 0;
+
+        const labelListList& pointEdges = pp.pointEdges();
+        forAll(pointEdges, pointI)
+        {
+            if (patchConstraints[pointI].first() == 2)
+            {
+                const point& pt = pp.localPoints()[pointI];
+                const labelList& pEdges = pointEdges[pointI];
+                const vector& featVec = patchConstraints[pointI].second();
+
+                // Detect whether there are edges in both directions.
+                // (direction along the feature edge that is)
+                bool hasPos = false;
+                bool hasNeg = false;
+
+                forAll(pEdges, pEdgeI)
+                {
+                    const edge& e = pp.edges()[pEdges[pEdgeI]];
+                    label nbrPointI = e.otherVertex(pointI);
+
+                    if (patchConstraints[nbrPointI].first() > 1)
+                    {
+                        const point& nbrPt = pp.localPoints()[nbrPointI];
+                        const point featPt =
+                            nbrPt + patchAttraction[nbrPointI];
+                        const scalar cosAngle = (featVec & (featPt-pt));
+
+                        if (cosAngle > 0)
+                        {
+                            hasPos = true;
+                        }
+                        else
+                        {
+                            hasNeg = true;
+                        }
+                    }
+                }
+
+                if (!hasPos || !hasNeg)
+                {
+                    //Pout<< "**Detected feature string end at  "
+                    //    << pp.localPoints()[pointI] << endl;
+
+                    // No string. Assign best choice on either side
+                    label bestPosPointI = -1;
+                    scalar minPosDistSqr = GREAT;
+                    label bestNegPointI = -1;
+                    scalar minNegDistSqr = GREAT;
+
+                    forAll(pEdges, pEdgeI)
+                    {
+                        const edge& e = pp.edges()[pEdges[pEdgeI]];
+                        label nbrPointI = e.otherVertex(pointI);
+
+                        if
+                        (
+                            patchConstraints[nbrPointI].first() <= 1
+                         && rawPatchConstraints[nbrPointI].first() > 1
+                        )
+                        {
+                            const vector& nbrFeatVec =
+                                rawPatchConstraints[pointI].second();
+
+                            if (mag(featVec&nbrFeatVec) > featureCos)
+                            {
+                                // nbrPointI attracted to sameish feature
+                                // Note: also check on position.
+
+                                scalar d2 = magSqr
+                                (
+                                    rawPatchAttraction[nbrPointI]
+                                );
+
+                                const point featPt =
+                                    pp.localPoints()[nbrPointI]
+                                  + rawPatchAttraction[nbrPointI];
+                                const scalar cosAngle =
+                                    (featVec & (featPt-pt));
+
+                                if (cosAngle > 0)
+                                {
+                                    if (!hasPos && d2 < minPosDistSqr)
+                                    {
+                                        minPosDistSqr = d2;
+                                        bestPosPointI = nbrPointI;
+                                    }
+                                }
+                                else
+                                {
+                                    if (!hasNeg && d2 < minNegDistSqr)
+                                    {
+                                        minNegDistSqr = d2;
+                                        bestNegPointI = nbrPointI;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    if (bestPosPointI != -1)
+                    {
+                        // Use reconstructed-feature attraction. Use only
+                        // part of it since not sure...
+                        //const point& bestPt =
+                        //    pp.localPoints()[bestPosPointI];
+                        //Pout<< "**Overriding point " << bestPt
+                        //    << " on reconstructed feature edge at "
+                        //    << rawPatchAttraction[bestPosPointI]+bestPt
+                        //    << " to attracted-to-feature-edge." << endl;
+                        patchAttraction[bestPosPointI] =
+                            0.5*rawPatchAttraction[bestPosPointI];
+                        patchConstraints[bestPosPointI] =
+                            rawPatchConstraints[bestPosPointI];
+
+                        nChanged++;
+                    }
+                    if (bestNegPointI != -1)
+                    {
+                        // Use reconstructed-feature attraction. Use only
+                        // part of it since not sure...
+                        //const point& bestPt =
+                        //    pp.localPoints()[bestNegPointI];
+                        //Pout<< "**Overriding point " << bestPt
+                        //    << " on reconstructed feature edge at "
+                        //    << rawPatchAttraction[bestNegPointI]+bestPt
+                        //    << " to attracted-to-feature-edge." << endl;
+                        patchAttraction[bestNegPointI] =
+                            0.5*rawPatchAttraction[bestNegPointI];
+                        patchConstraints[bestNegPointI] =
+                            rawPatchConstraints[bestNegPointI];
+
+                        nChanged++;
+                    }
+                }
+            }
+        }
+
+
+        reduce(nChanged, sumOp<label>());
+        Info<< "Stringing feature edges : changed " << nChanged << " points"
+            << endl;
+        if (nChanged == 0)
+        {
+            break;
+        }
+    }
+}
+
+
 Foam::pointIndexHit Foam::autoSnapDriver::findNearFeatureEdge
 (
     const indirectPrimitivePatch& pp,
@@ -2113,156 +2311,20 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
     // Walk existing edges and snap remaining ones (that are marked as
     // feature edges in allPatchConstraints)
 
-    while (true)
-    {
-        label nChanged = 0;
+    stringFeatureEdges
+    (
+        iter,
+        featureCos,
 
-        const labelListList& pointEdges = pp.pointEdges();
-        forAll(pointEdges, pointI)
-        {
-            if (patchConstraints[pointI].first() == 2)
-            {
-                const point& pt = pp.localPoints()[pointI];
-                const labelList& pEdges = pointEdges[pointI];
-                const vector& featVec = patchConstraints[pointI].second();
+        pp,
+        snapDist,
 
-                // Detect whether there are edges in both directions.
-                // (direction along the feature edge that is)
-                bool hasPos = false;
-                bool hasNeg = false;
-
-                forAll(pEdges, pEdgeI)
-                {
-                    const edge& e = pp.edges()[pEdges[pEdgeI]];
-                    label nbrPointI = e.otherVertex(pointI);
-
-                    if (patchConstraints[nbrPointI].first() > 1)
-                    {
-                        const point& nbrPt = pp.localPoints()[nbrPointI];
-                        const point featPt =
-                            nbrPt + patchAttraction[nbrPointI];
-                        const scalar cosAngle = (featVec & (featPt-pt));
-
-                        if (cosAngle > 0)
-                        {
-                            hasPos = true;
-                        }
-                        else
-                        {
-                            hasNeg = true;
-                        }
-                    }
-                }
-
-                if (!hasPos || !hasNeg)
-                {
-                    //Pout<< "**Detected feature string end at  "
-                    //    << pp.localPoints()[pointI] << endl;
-
-                    // No string. Assign best choice on either side
-                    label bestPosPointI = -1;
-                    scalar minPosDistSqr = GREAT;
-                    label bestNegPointI = -1;
-                    scalar minNegDistSqr = GREAT;
-
-                    forAll(pEdges, pEdgeI)
-                    {
-                        const edge& e = pp.edges()[pEdges[pEdgeI]];
-                        label nbrPointI = e.otherVertex(pointI);
-
-                        if
-                        (
-                            patchConstraints[nbrPointI].first() <= 1
-                         && allPatchConstraints[nbrPointI].first() > 1
-                        )
-                        {
-                            const vector& nbrFeatVec =
-                                allPatchConstraints[pointI].second();
-
-                            if (mag(featVec&nbrFeatVec) > featureCos)
-                            {
-                                // nbrPointI attracted to sameish feature
-                                // Note: also check on position.
-
-                                scalar d2 = magSqr
-                                (
-                                    allPatchAttraction[nbrPointI]
-                                );
-
-                                const point featPt =
-                                    pp.localPoints()[nbrPointI]
-                                  + allPatchAttraction[nbrPointI];
-                                const scalar cosAngle =
-                                    (featVec & (featPt-pt));
-
-                                if (cosAngle > 0)
-                                {
-                                    if (!hasPos && d2 < minPosDistSqr)
-                                    {
-                                        minPosDistSqr = d2;
-                                        bestPosPointI = nbrPointI;
-                                    }
-                                }
-                                else
-                                {
-                                    if (!hasNeg && d2 < minNegDistSqr)
-                                    {
-                                        minNegDistSqr = d2;
-                                        bestNegPointI = nbrPointI;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    if (bestPosPointI != -1)
-                    {
-                        // Use reconstructed-feature attraction. Use only
-                        // part of it since not sure...
-                        //const point& bestPt =
-                        //    pp.localPoints()[bestPosPointI];
-                        //Pout<< "**Overriding point " << bestPt
-                        //    << " on reconstructed feature edge at "
-                        //    << allPatchAttraction[bestPosPointI]+bestPt
-                        //    << " to attracted-to-feature-edge." << endl;
-                        patchAttraction[bestPosPointI] =
-                            0.5*allPatchAttraction[bestPosPointI];
-                        patchConstraints[bestPosPointI] =
-                            allPatchConstraints[bestPosPointI];
-
-                        nChanged++;
-                    }
-                    if (bestNegPointI != -1)
-                    {
-                        // Use reconstructed-feature attraction. Use only
-                        // part of it since not sure...
-                        //const point& bestPt =
-                        //    pp.localPoints()[bestNegPointI];
-                        //Pout<< "**Overriding point " << bestPt
-                        //    << " on reconstructed feature edge at "
-                        //    << allPatchAttraction[bestNegPointI]+bestPt
-                        //    << " to attracted-to-feature-edge." << endl;
-                        patchAttraction[bestNegPointI] =
-                            0.5*allPatchAttraction[bestNegPointI];
-                        patchConstraints[bestNegPointI] =
-                            allPatchConstraints[bestNegPointI];
-
-                        nChanged++;
-                    }
-                }
-            }
-        }
-
-
-        reduce(nChanged, sumOp<label>());
-        Info<< "Stringing feature edges : changed " << nChanged << " points"
-            << endl;
-        if (nChanged == 0)
-        {
-            break;
-        }
-    }
+        allPatchAttraction,
+        allPatchConstraints,
 
+        patchAttraction,
+        patchConstraints
+    );
 
 
     // Avoid diagonal attraction
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
index e1b76c44e1..8cc7ba12f2 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -312,7 +312,8 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
                     {
                         Pout<< "Adding particle from point:" << pointI
                             << " coord:" << featureMesh.points()[pointI]
-                            << " pEdges:" << pointEdges[pointI]
+                            << " since number of emanating edges:"
+                            << pointEdges[pointI].size()
                             << endl;
                     }
 

From 267d6fa42c7acead8b4d9b830df95dd2667243ff Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 3 Oct 2012 16:54:10 +0100
Subject: [PATCH 12/14] ENH: checkMesh: parallel sizes printing for patches

---
 .../manipulation/checkMesh/checkTopology.C    | 144 ++++++++++--------
 1 file changed, 82 insertions(+), 62 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 28930c573f..39e7375a67 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -7,6 +7,7 @@
 #include "pointSet.H"
 #include "IOmanip.H"
 #include "emptyPolyPatch.H"
+#include "processorPolyPatch.H"
 
 Foam::label Foam::checkTopology
 (
@@ -289,10 +290,18 @@ Foam::label Foam::checkTopology
         }
     }
 
-    if (!Pstream::parRun())
+
     {
-        Pout<< "\nChecking patch topology for multiply connected surfaces ..."
-            << endl;
+        if (!Pstream::parRun())
+        {
+            Info<< "\nChecking patch topology for multiply connected"
+                << " surfaces..." << endl;
+        }
+        else
+        {
+            Info<< "\nChecking basic patch addressing..." << endl;
+        }
+
 
         const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
@@ -301,90 +310,101 @@ Foam::label Foam::checkTopology
         (
             mesh,
             "nonManifoldPoints",
-            mesh.nPoints()/100
+            mesh.nPoints()/1000
         );
 
         Pout.setf(ios_base::left);
 
-        Pout<< "    "
+        Info<< "    "
             << setw(20) << "Patch"
             << setw(9) << "Faces"
-            << setw(9) << "Points"
-            << setw(34) << "Surface topology";
+            << setw(9) << "Points";
+        if (!Pstream::parRun())
+        {
+            Info<< setw(34) << "Surface topology";
+        }
         if (allGeometry)
         {
-            Pout<< " Bounding box";
+            Info<< " Bounding box";
         }
-        Pout<< endl;
+        Info<< endl;
 
         forAll(patches, patchI)
         {
             const polyPatch& pp = patches[patchI];
 
-                Pout<< "    "
+            if (!isA<processorPolyPatch>(pp))
+            {
+                Info<< "    "
                     << setw(20) << pp.name()
-                    << setw(9) << pp.size()
-                    << setw(9) << pp.nPoints();
+                    << setw(9) << returnReduce(pp.size(), sumOp<label>())
+                    << setw(9) << returnReduce(pp.nPoints(), sumOp<label>());
 
-
-            primitivePatch::surfaceTopo pTyp = pp.surfaceType();
-
-            if (pp.empty())
-            {
-                Pout<< setw(34) << "ok (empty)";
-            }
-            else if (pTyp == primitivePatch::MANIFOLD)
-            {
-                if (pp.checkPointManifold(true, &points))
+                if (!Pstream::parRun())
                 {
-                    Pout<< setw(34) << "multiply connected (shared point)";
-                }
-                else
-                {
-                    Pout<< setw(34) << "ok (closed singly connected)";
-                }
+                    primitivePatch::surfaceTopo pTyp = pp.surfaceType();
 
-                // Add points on non-manifold edges to make set complete
-                pp.checkTopology(false, &points);
-            }
-            else
-            {
-                pp.checkTopology(false, &points);
-
-                if (pTyp == primitivePatch::OPEN)
-                {
-                    Pout<< setw(34) << "ok (non-closed singly connected)";
-                }
-                else
-                {
-                    Pout<< setw(34) << "multiply connected (shared edge)";
-                }
-            }
-
-            if (allGeometry)
-            {
-                const pointField& pts = pp.points();
-                const labelList& mp = pp.meshPoints();
-
-                if (returnReduce(mp.size(), sumOp<label>()) > 0)
-                {
-                    boundBox bb(point::max, point::min);
-                    forAll (mp, i)
+                    if (pp.empty())
                     {
-                        bb.min() = min(bb.min(), pts[mp[i]]);
-                        bb.max() = max(bb.max(), pts[mp[i]]);
+                        Info<< setw(34) << "ok (empty)";
+                    }
+                    else if (pTyp == primitivePatch::MANIFOLD)
+                    {
+                        if (pp.checkPointManifold(true, &points))
+                        {
+                            Info<< setw(34)
+                                << "multiply connected (shared point)";
+                        }
+                        else
+                        {
+                            Info<< setw(34) << "ok (closed singly connected)";
+                        }
+
+                        // Add points on non-manifold edges to make set complete
+                        pp.checkTopology(false, &points);
+                    }
+                    else
+                    {
+                        pp.checkTopology(false, &points);
+
+                        if (pTyp == primitivePatch::OPEN)
+                        {
+                            Info<< setw(34)
+                                << "ok (non-closed singly connected)";
+                        }
+                        else
+                        {
+                            Info<< setw(34)
+                                << "multiply connected (shared edge)";
+                        }
                     }
-                    reduce(bb.min(), minOp<vector>());
-                    reduce(bb.max(), maxOp<vector>());
-                    Pout<< ' ' << bb;
                 }
+
+                if (allGeometry)
+                {
+                    const pointField& pts = pp.points();
+                    const labelList& mp = pp.meshPoints();
+
+                    if (returnReduce(mp.size(), sumOp<label>()) > 0)
+                    {
+                        boundBox bb(point::max, point::min);
+                        forAll (mp, i)
+                        {
+                            bb.min() = min(bb.min(), pts[mp[i]]);
+                            bb.max() = max(bb.max(), pts[mp[i]]);
+                        }
+                        reduce(bb.min(), minOp<vector>());
+                        reduce(bb.max(), maxOp<vector>());
+                        Info<< ' ' << bb;
+                    }
+                }
+                Info<< endl;
             }
-            Pout<< endl;
         }
 
         if (points.size())
         {
-            Pout<< "  <<Writing " << points.size()
+            Info<< "  <<Writing " << returnReduce(points.size(), sumOp<label>())
                 << " conflicting points to set "
                 << points.name() << endl;
 
@@ -392,7 +412,7 @@ Foam::label Foam::checkTopology
             points.write();
         }
 
-        //Pout.setf(ios_base::right);
+        //Info.setf(ios_base::right);
     }
 
     // Force creation of all addressing if requested.

From ca2ad8032e47f391ff0a24e089277b173662a735 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 3 Oct 2012 22:43:50 +0100
Subject: [PATCH 13/14] Thermodynamics: Completed dictionary based selection
 mechanisms for all thermodynamic packages

Rationalised "make" macros to reduce code duplication
Removed solid phase radiation properties
Updated tutorials appropriately
---
 ...emperatureThermoBaffleFvPatchScalarField.C |  13 +-
 ...emperatureThermoBaffleFvPatchScalarField.H |   2 +-
 .../thermoBaffle2D/thermoBaffle2D.C           |   8 +-
 src/thermophysicalModels/basic/Make/files     |   8 +-
 .../basic/basicThermo/basicThermo.H           |  12 +
 .../basic/basicThermo/basicThermoTemplates.C  |  92 ++++--
 .../basic/fluidThermo/makeThermo.H            |  25 +-
 .../psiThermo/{hePsiThermo => }/hePsiThermo.C |  22 +-
 .../psiThermo/{hePsiThermo => }/hePsiThermo.H |   8 +-
 .../psiThermo/{psiThermo => }/psiThermo.C     |   0
 .../psiThermo/{psiThermo => }/psiThermo.H     |   0
 .../hePsiThermos.C => psiThermos.C}           |   0
 .../rhoThermo/{heRhoThermo => }/heRhoThermo.C |  18 +-
 .../rhoThermo/{heRhoThermo => }/heRhoThermo.H |   8 +-
 .../rhoThermo/{rhoThermo => }/rhoThermo.C     |   0
 .../rhoThermo/{rhoThermo => }/rhoThermo.H     |   0
 .../heRhoThermos.C => rhoThermos.C}           |   0
 .../chemistryModel/chemistryModel.C           |  23 +-
 .../psiChemistryModel/psiChemistryModel.C     |   2 +-
 .../rhoChemistryModel/rhoChemistryModel.C     |   2 +-
 .../radiationCoupledBase.C                    |  50 ++--
 .../reactionThermo/Make/files                 |  12 +-
 .../reactionThermo/makeReactionThermo.H       |   2 +-
 .../hePsiReactionThermo/hePsiReactionThermo.C | 147 ----------
 .../psiReactionThermo.C                       |   0
 .../psiReactionThermo.H                       |   0
 ...ReactionThermos.C => psiReactionThermos.C} |  30 +-
 .../heheuPsiThermo.C}                         |  50 ++--
 .../heheuPsiThermo.H}                         |  22 +-
 .../psiuReactionThermo/psiuReactionThermo.C   |   0
 .../psiuReactionThermo/psiuReactionThermo.H   |   0
 .../psiuReactionThermos.C}                    |  18 +-
 .../heRhoReactionThermo/heRhoReactionThermo.C | 145 ----------
 .../heRhoReactionThermo/heRhoReactionThermo.H | 100 -------
 .../rhoReactionThermo.C                       |   0
 .../rhoReactionThermo.H                       |   0
 ...ReactionThermos.C => rhoReactionThermos.C} |  48 ++--
 .../solidSpecie/Make/files                    |   2 +-
 ...idReactionThermo.H => makeSolidReaction.H} |   5 +-
 ...ThermoReactions.C => makeSolidReactions.C} |   2 +-
 .../solidThermo/Make/files                    |   3 +-
 .../basicSolidMixture/basicSolidMixture.H     |  14 +-
 .../basicSolidMixture/basicSolidMixtures.C    |   3 -
 .../multiComponentSolidMixture.C              |  45 ---
 .../multiComponentSolidMixture.H              |  10 -
 .../solidReactionThermos.C}                   |  86 ++----
 .../heSolidThermo.C                           | 271 ------------------
 .../heSolidThermo.H                           |  21 +-
 .../solidThermo/solidThermo/makeSolidThermo.H |  67 +----
 .../solidThermo/solidThermo/solidThermo.H     |  29 --
 .../solidThermo/solidThermo/solidThermoNew.C  |  51 +---
 .../solidThermos.C}                           |  26 +-
 src/thermophysicalModels/specie/Make/files    |  13 +-
 ...ctionThermoReactions.C => makeReactions.C} |   0
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../gri/constant/thermophysicalProperties     |   2 +-
 .../h2/constant/thermophysicalProperties      |   2 +-
 .../ic8h18/constant/thermophysicalProperties  |   2 +-
 .../nc7h16/constant/thermophysicalProperties  |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../panelRegion/thermophysicalProperties      |  11 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../system/changeDictionaryDict.baffleRegion  |  11 +-
 .../constant/heater/thermophysicalProperties  |  11 +-
 .../leftSolid/thermophysicalProperties        |  11 +-
 .../rightSolid/thermophysicalProperties       |  11 +-
 .../constant/heater/thermophysicalProperties  |  11 +-
 .../leftSolid/thermophysicalProperties        |  11 +-
 .../rightSolid/thermophysicalProperties       |  11 +-
 .../constant/heater/thermophysicalProperties  |  11 +-
 .../leftSolid/thermophysicalProperties        |  11 +-
 .../rightSolid/thermophysicalProperties       |  11 +-
 .../constant/heater/thermophysicalProperties  |  11 +-
 .../leftSolid/thermophysicalProperties        |  11 +-
 .../rightSolid/thermophysicalProperties       |  11 +-
 .../constant/heater/thermophysicalProperties  |  13 +-
 .../leftSolid/thermophysicalProperties        |  11 +-
 .../rightSolid/thermophysicalProperties       |  11 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../filter/constant/thermophysicalProperties  |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/thermophysicalProperties         |   2 +-
 93 files changed, 536 insertions(+), 1212 deletions(-)
 rename src/thermophysicalModels/basic/psiThermo/{hePsiThermo => }/hePsiThermo.C (85%)
 rename src/thermophysicalModels/basic/psiThermo/{hePsiThermo => }/hePsiThermo.H (91%)
 rename src/thermophysicalModels/basic/psiThermo/{psiThermo => }/psiThermo.C (100%)
 rename src/thermophysicalModels/basic/psiThermo/{psiThermo => }/psiThermo.H (100%)
 rename src/thermophysicalModels/basic/psiThermo/{hePsiThermo/hePsiThermos.C => psiThermos.C} (100%)
 rename src/thermophysicalModels/basic/rhoThermo/{heRhoThermo => }/heRhoThermo.C (89%)
 rename src/thermophysicalModels/basic/rhoThermo/{heRhoThermo => }/heRhoThermo.H (92%)
 rename src/thermophysicalModels/basic/rhoThermo/{rhoThermo => }/rhoThermo.C (100%)
 rename src/thermophysicalModels/basic/rhoThermo/{rhoThermo => }/rhoThermo.H (100%)
 rename src/thermophysicalModels/basic/rhoThermo/{heRhoThermo/heRhoThermos.C => rhoThermos.C} (100%)
 delete mode 100644 src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.C
 rename src/thermophysicalModels/reactionThermo/psiReactionThermo/{psiReactionThermo => }/psiReactionThermo.C (100%)
 rename src/thermophysicalModels/reactionThermo/psiReactionThermo/{psiReactionThermo => }/psiReactionThermo.H (100%)
 rename src/thermophysicalModels/reactionThermo/psiReactionThermo/{hePsiReactionThermo/hePsiReactionThermos.C => psiReactionThermos.C} (92%)
 rename src/thermophysicalModels/reactionThermo/{psiReactionThermo/heheuReactionThermo/heheuReactionThermo.C => psiuReactionThermo/heheuPsiThermo.C} (90%)
 rename src/thermophysicalModels/reactionThermo/{psiReactionThermo/heheuReactionThermo/heheuReactionThermo.H => psiuReactionThermo/heheuPsiThermo.H} (90%)
 rename src/thermophysicalModels/reactionThermo/{psiReactionThermo => }/psiuReactionThermo/psiuReactionThermo.C (100%)
 rename src/thermophysicalModels/reactionThermo/{psiReactionThermo => }/psiuReactionThermo/psiuReactionThermo.H (100%)
 rename src/thermophysicalModels/reactionThermo/{psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C => psiuReactionThermo/psiuReactionThermos.C} (93%)
 delete mode 100644 src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.C
 delete mode 100644 src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.H
 rename src/thermophysicalModels/reactionThermo/rhoReactionThermo/{rhoReactionThermo => }/rhoReactionThermo.C (100%)
 rename src/thermophysicalModels/reactionThermo/rhoReactionThermo/{rhoReactionThermo => }/rhoReactionThermo.H (100%)
 rename src/thermophysicalModels/reactionThermo/rhoReactionThermo/{heRhoReactionThermo/heRhoReactionThermos.C => rhoReactionThermos.C} (90%)
 rename src/thermophysicalModels/solidSpecie/reaction/reactions/{makeSolidReactionThermo.H => makeSolidReaction.H} (97%)
 rename src/thermophysicalModels/solidSpecie/reaction/reactions/{makeSolidReactionThermoReactions.C => makeSolidReactions.C} (97%)
 rename src/thermophysicalModels/{reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.H => solidThermo/solidReactionThermo/solidReactionThermos.C} (52%)
 rename src/thermophysicalModels/solidThermo/{heSolidThermo => solidThermo}/heSolidThermo.C (53%)
 rename src/thermophysicalModels/solidThermo/{heSolidThermo => solidThermo}/heSolidThermo.H (81%)
 rename src/thermophysicalModels/solidThermo/{heSolidThermo/heSolidThermos.C => solidThermo/solidThermos.C} (88%)
 rename src/thermophysicalModels/specie/reaction/reactions/{makeReactionThermoReactions.C => makeReactions.C} (100%)

diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C
index 0e11217066..f3c4fd3b6d 100644
--- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C
@@ -46,7 +46,7 @@ temperatureThermoBaffleFvPatchScalarField
     turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(p, iF),
     owner_(false),
     baffle_(),
-    solidThermoType_("undefined"),
+    solidThermoType_(new primitiveEntry("thermoType", "undefined")),
     dict_(dictionary::null)
 {}
 
@@ -69,7 +69,7 @@ temperatureThermoBaffleFvPatchScalarField
     ),
     owner_(ptf.owner_),
     baffle_(ptf.baffle_),
-    solidThermoType_(ptf.solidThermoType_),
+    solidThermoType_(ptf.solidThermoType_().clone()),
     dict_(ptf.dict_)
 {}
 
@@ -85,7 +85,7 @@ temperatureThermoBaffleFvPatchScalarField
     turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(p, iF, dict),
     owner_(false),
     baffle_(),
-    solidThermoType_(),
+    solidThermoType_(new primitiveEntry("thermoType", "undefined")),
     dict_(dict)
 {
     if (!isA<mappedPatchBase>(patch().patch()))
@@ -126,7 +126,7 @@ temperatureThermoBaffleFvPatchScalarField
         Info << "Creating thermal baffle" <<  nbrMesh << endl;
         baffle_.reset(baffle::New(thisMesh, dict).ptr());
         owner_ = true;
-        dict.lookup("thermoType") >> solidThermoType_;
+        solidThermoType_ = dict.lookupEntry("thermoType", false, false).clone();
         baffle_->rename(nbrMesh);
     }
 }
@@ -142,7 +142,7 @@ temperatureThermoBaffleFvPatchScalarField
     turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(ptf, iF),
     owner_(ptf.owner_),
     baffle_(ptf.baffle_),
-    solidThermoType_(ptf.solidThermoType_),
+    solidThermoType_(ptf.solidThermoType_().clone()),
     dict_(ptf.dict_)
 {}
 
@@ -219,8 +219,7 @@ void temperatureThermoBaffleFvPatchScalarField::write(Ostream& os) const
         os.writeKeyword(word(thermoModel + "Coeffs"));
         os << dict_.subDict(thermoModel + "Coeffs") << nl;
 
-        os.writeKeyword("thermoType") << solidThermoType_
-            << token::END_STATEMENT << nl;
+        os << solidThermoType_() << nl;
 
         os.writeKeyword("mixture");
         os << dict_.subDict("mixture") << nl;
diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
index 6dd5cbbb4e..32b63ebe39 100644
--- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
@@ -140,7 +140,7 @@ class temperatureThermoBaffleFvPatchScalarField
         autoPtr<regionModels::thermoBaffleModels::thermoBaffleModel> baffle_;
 
         //- Solid thermo type
-        word solidThermoType_;
+        autoPtr<entry> solidThermoType_;
 
         //- Dictionary
         dictionary dict_;
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
index 97faec40cb..144b451bbc 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
@@ -318,7 +318,13 @@ const tmp<volScalarField> thermoBaffle2D::Cp() const
 
 const volScalarField& thermoBaffle2D::kappaRad() const
 {
-    return thermo_->kappaRad();
+    // ***HGW return thermo_->kappaRad();
+    FatalErrorIn
+    (
+        "thermoBaffle2D::kappaRad()"
+    )   << "not currently supported"
+        << exit(FatalError);
+    return volScalarField::null();
 }
 
 
diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files
index ca80ac7279..3dc3d0c082 100644
--- a/src/thermophysicalModels/basic/Make/files
+++ b/src/thermophysicalModels/basic/Make/files
@@ -1,11 +1,11 @@
 basicThermo/basicThermo.C
 fluidThermo/fluidThermo.C
 
-psiThermo/psiThermo/psiThermo.C
-psiThermo/hePsiThermo/hePsiThermos.C
+psiThermo/psiThermo.C
+psiThermo/psiThermos.C
 
-rhoThermo/rhoThermo/rhoThermo.C
-rhoThermo/heRhoThermo/heRhoThermos.C
+rhoThermo/rhoThermo.C
+rhoThermo/rhoThermos.C
 
 derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C
 derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
index 3bd01792ba..2064444ff2 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@@ -105,10 +105,22 @@ public:
 
     // Selectors
 
+        //- Generic lookup for each of the related thermodynamics packages
+        template<class Thermo, class Table>
+        static typename Table::iterator lookupThermo
+        (
+            const dictionary& thermoDict,
+            Table* tablePtr
+        );
+
         //- Generic New for each of the related thermodynamics packages
         template<class Thermo>
         static autoPtr<Thermo> New(const fvMesh&);
 
+        //- Generic New for each of the related thermodynamics packages
+        template<class Thermo>
+        static autoPtr<Thermo> New(const fvMesh&, const dictionary&);
+
         //- Specialisation of the Generic New for basicThermo
         static autoPtr<basicThermo> New(const fvMesh&);
 
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
index e59e2b6a26..e22b4f33c7 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
@@ -27,25 +27,13 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-template<class Thermo>
-Foam::autoPtr<Thermo> Foam::basicThermo::New
+template<class Thermo, class Table>
+typename Table::iterator Foam::basicThermo::lookupThermo
 (
-    const fvMesh& mesh
+    const dictionary& thermoDict,
+    Table* tablePtr
 )
 {
-    IOdictionary thermoDict
-    (
-        IOobject
-        (
-            "thermophysicalProperties",
-            mesh.time().constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE,
-            false
-        )
-    );
-
     word thermoTypeName;
 
     if (thermoDict.isDict("thermoType"))
@@ -76,16 +64,13 @@ Foam::autoPtr<Thermo> Foam::basicThermo::New
           + word(thermoTypeDict.lookup("specie")) + ">>,"
           + word(thermoTypeDict.lookup("energy")) + ">>>";
 
-        Info<< thermoTypeName << endl;
-
         // Lookup the thermo package
-        typename Thermo::fvMeshConstructorTable::iterator cstrIter =
-            Thermo::fvMeshConstructorTablePtr_->find(thermoTypeName);
+        typename Table::iterator cstrIter = tablePtr->find(thermoTypeName);
 
         // Print error message if package not found in the table
-        if (cstrIter == Thermo::fvMeshConstructorTablePtr_->end())
+        if (cstrIter == tablePtr->end())
         {
-            FatalErrorIn(Thermo::typeName + "::New(const fvMesh&)")
+            FatalErrorIn(Thermo::typeName + "::New")
                 << "Unknown " << Thermo::typeName << " type " << nl
                 << "thermoType" << thermoTypeDict << nl << nl
                 << "Valid " << Thermo::typeName << " types are:" << nl << nl;
@@ -93,7 +78,7 @@ Foam::autoPtr<Thermo> Foam::basicThermo::New
             // Get the list of all the suitable thermo packages available
             wordList validThermoTypeNames
             (
-                Thermo::fvMeshConstructorTablePtr_->sortedToc()
+                tablePtr->sortedToc()
             );
 
             // Build a table of the thermo packages constituent parts
@@ -123,7 +108,7 @@ Foam::autoPtr<Thermo> Foam::basicThermo::New
             FatalError<< exit(FatalError);
         }
 
-        return autoPtr<Thermo>(cstrIter()(mesh));
+        return cstrIter;
     }
     else
     {
@@ -131,22 +116,69 @@ Foam::autoPtr<Thermo> Foam::basicThermo::New
 
         Info<< "Selecting thermodynamics package " << thermoTypeName << endl;
 
-        typename Thermo::fvMeshConstructorTable::iterator cstrIter =
-            Thermo::fvMeshConstructorTablePtr_->find(thermoTypeName);
+        typename Table::iterator cstrIter = tablePtr->find(thermoTypeName);
 
-        if (cstrIter == Thermo::fvMeshConstructorTablePtr_->end())
+        if (cstrIter == tablePtr->end())
         {
-            FatalErrorIn(Thermo::typeName + "::New(const fvMesh&)")
+            FatalErrorIn(Thermo::typeName + "::New")
                 << "Unknown " << Thermo::typeName << " type "
                 << thermoTypeName << nl << nl
                 << "Valid " << Thermo::typeName << " types are:" << nl
-                << Thermo::fvMeshConstructorTablePtr_->sortedToc() << nl
+                << tablePtr->sortedToc() << nl
                 << exit(FatalError);
         }
 
-        return autoPtr<Thermo>(cstrIter()(mesh));
+        return cstrIter;
     }
 }
 
 
+template<class Thermo>
+Foam::autoPtr<Thermo> Foam::basicThermo::New
+(
+    const fvMesh& mesh
+)
+{
+    IOdictionary thermoDict
+    (
+        IOobject
+        (
+            "thermophysicalProperties",
+            mesh.time().constant(),
+            mesh,
+            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    typename Thermo::fvMeshConstructorTable::iterator cstrIter =
+        lookupThermo<Thermo, typename Thermo::fvMeshConstructorTable>
+        (
+            thermoDict,
+            Thermo::fvMeshConstructorTablePtr_
+        );
+
+    return autoPtr<Thermo>(cstrIter()(mesh));
+}
+
+
+template<class Thermo>
+Foam::autoPtr<Thermo> Foam::basicThermo::New
+(
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+{
+    typename Thermo::dictionaryConstructorTable::iterator cstrIter =
+        lookupThermo<Thermo, typename Thermo::dictionaryConstructorTable>
+        (
+            dict,
+            Thermo::dictionaryConstructorTablePtr_
+        );
+
+    return autoPtr<Thermo>(cstrIter()(mesh, dict));
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
index 21f430269b..7a136ebfb0 100644
--- a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
+++ b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
@@ -37,7 +37,7 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
+#define makeThermoTypedefs(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
                                                                               \
 typedef                                                                       \
     Transport                                                                 \
@@ -58,10 +58,8 @@ typedef                                                                       \
 typedef                                                                       \
     Cthermo                                                                   \
     <                                                                         \
-        Mixture                                                               \
-        <                                                                     \
-            Transport##Type##Thermo##EqnOfState##Specie                       \
-        >                                                                     \
+        BaseThermo,                                                           \
+        Mixture<Transport##Type##Thermo##EqnOfState##Specie>                  \
     > Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie;          \
                                                                               \
 defineTemplateTypeNameAndDebugWithName                                        \
@@ -73,7 +71,22 @@ defineTemplateTypeNameAndDebugWithName                                        \
       + ">>"                                                                  \
     ).c_str(),                                                                \
     0                                                                         \
-);                                                                            \
+);
+
+
+#define makeThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
+                                                                              \
+makeThermoTypedefs                                                            \
+(                                                                             \
+    BaseThermo,                                                               \
+    Cthermo,                                                                  \
+    Mixture,                                                                  \
+    Transport,                                                                \
+    Type,                                                                     \
+    Thermo,                                                                   \
+    EqnOfState,                                                               \
+    Specie                                                                    \
+)                                                                             \
                                                                               \
 addToRunTimeSelectionTable                                                    \
 (                                                                             \
diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
similarity index 85%
rename from src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.C
rename to src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
index 47570b82a3..568191fd56 100644
--- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
@@ -27,8 +27,8 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class MixtureType>
-void Foam::hePsiThermo<MixtureType>::calculate()
+template<class BasicPsiThermo, class MixtureType>
+void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::calculate()
 {
     const scalarField& hCells = this->he_.internalField();
     const scalarField& pCells = this->p_.internalField();
@@ -101,10 +101,10 @@ void Foam::hePsiThermo<MixtureType>::calculate()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class MixtureType>
-Foam::hePsiThermo<MixtureType>::hePsiThermo(const fvMesh& mesh)
+template<class BasicPsiThermo, class MixtureType>
+Foam::hePsiThermo<BasicPsiThermo, MixtureType>::hePsiThermo(const fvMesh& mesh)
 :
-    heThermo<psiThermo, MixtureType>(mesh)
+    heThermo<BasicPsiThermo, MixtureType>(mesh)
 {
     calculate();
 
@@ -115,19 +115,19 @@ Foam::hePsiThermo<MixtureType>::hePsiThermo(const fvMesh& mesh)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class MixtureType>
-Foam::hePsiThermo<MixtureType>::~hePsiThermo()
+template<class BasicPsiThermo, class MixtureType>
+Foam::hePsiThermo<BasicPsiThermo, MixtureType>::~hePsiThermo()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class MixtureType>
-void Foam::hePsiThermo<MixtureType>::correct()
+template<class BasicPsiThermo, class MixtureType>
+void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::correct()
 {
     if (debug)
     {
-        Info<< "entering hePsiThermo<MixtureType>::correct()" << endl;
+        Info<< "entering hePsiThermo<BasicPsiThermo, MixtureType>::correct()" << endl;
     }
 
     // force the saving of the old-time values
@@ -137,7 +137,7 @@ void Foam::hePsiThermo<MixtureType>::correct()
 
     if (debug)
     {
-        Info<< "exiting hePsiThermo<MixtureType>::correct()" << endl;
+        Info<< "exiting hePsiThermo<BasicPsiThermo, MixtureType>::correct()" << endl;
     }
 }
 
diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.H b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.H
similarity index 91%
rename from src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.H
rename to src/thermophysicalModels/basic/psiThermo/hePsiThermo.H
index d6132ec453..a701a854c2 100644
--- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.H
+++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.H
@@ -25,7 +25,7 @@ Class
     Foam::hePsiThermo
 
 Description
-    Enthalpy for a mixture based on compressibility
+    Energy for a mixture based on compressibility
 
 SourceFiles
     hePsiThermo.C
@@ -47,10 +47,10 @@ namespace Foam
                          Class hePsiThermo Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class MixtureType>
+template<class BasicPsiThermo, class MixtureType>
 class hePsiThermo
 :
-    public heThermo<psiThermo, MixtureType>
+    public heThermo<BasicPsiThermo, MixtureType>
 {
     // Private Member Functions
 
@@ -58,7 +58,7 @@ class hePsiThermo
         void calculate();
 
         //- Construct as copy (not implemented)
-        hePsiThermo(const hePsiThermo<MixtureType>&);
+        hePsiThermo(const hePsiThermo<BasicPsiThermo, MixtureType>&);
 
 public:
 
diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C b/src/thermophysicalModels/basic/psiThermo/psiThermo.C
similarity index 100%
rename from src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C
rename to src/thermophysicalModels/basic/psiThermo/psiThermo.C
diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H b/src/thermophysicalModels/basic/psiThermo/psiThermo.H
similarity index 100%
rename from src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H
rename to src/thermophysicalModels/basic/psiThermo/psiThermo.H
diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C b/src/thermophysicalModels/basic/psiThermo/psiThermos.C
similarity index 100%
rename from src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
rename to src/thermophysicalModels/basic/psiThermo/psiThermos.C
diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
similarity index 89%
rename from src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.C
rename to src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
index d76ba12b1d..0284f76454 100644
--- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
@@ -27,8 +27,8 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class MixtureType>
-void Foam::heRhoThermo<MixtureType>::calculate()
+template<class BasicPsiThermo, class MixtureType>
+void Foam::heRhoThermo<BasicPsiThermo, MixtureType>::calculate()
 {
     const scalarField& hCells = this->he().internalField();
     const scalarField& pCells = this->p_.internalField();
@@ -106,10 +106,10 @@ void Foam::heRhoThermo<MixtureType>::calculate()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class MixtureType>
-Foam::heRhoThermo<MixtureType>::heRhoThermo(const fvMesh& mesh)
+template<class BasicPsiThermo, class MixtureType>
+Foam::heRhoThermo<BasicPsiThermo, MixtureType>::heRhoThermo(const fvMesh& mesh)
 :
-    heThermo<rhoThermo, MixtureType>(mesh)
+    heThermo<BasicPsiThermo, MixtureType>(mesh)
 {
     calculate();
 }
@@ -117,15 +117,15 @@ Foam::heRhoThermo<MixtureType>::heRhoThermo(const fvMesh& mesh)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class MixtureType>
-Foam::heRhoThermo<MixtureType>::~heRhoThermo()
+template<class BasicPsiThermo, class MixtureType>
+Foam::heRhoThermo<BasicPsiThermo, MixtureType>::~heRhoThermo()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class MixtureType>
-void Foam::heRhoThermo<MixtureType>::correct()
+template<class BasicPsiThermo, class MixtureType>
+void Foam::heRhoThermo<BasicPsiThermo, MixtureType>::correct()
 {
     if (debug)
     {
diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H
similarity index 92%
rename from src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.H
rename to src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H
index a2d62a78a2..9722526fc6 100644
--- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.H
+++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H
@@ -25,7 +25,7 @@ Class
     Foam::heRhoThermo
 
 Description
-    Enthalpy for a mixture based on density
+    Energy for a mixture based on density
 
 SourceFiles
     heRhoThermo.C
@@ -47,10 +47,10 @@ namespace Foam
                          Class heRhoThermo Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class MixtureType>
+template<class BasicPsiThermo, class MixtureType>
 class heRhoThermo
 :
-    public heThermo<rhoThermo, MixtureType>
+    public heThermo<BasicPsiThermo, MixtureType>
 {
     // Private Member Functions
 
@@ -58,7 +58,7 @@ class heRhoThermo
         void calculate();
 
         //- Construct as copy (not implemented)
-        heRhoThermo(const heRhoThermo<MixtureType>&);
+        heRhoThermo(const heRhoThermo<BasicPsiThermo, MixtureType>&);
 
 
 public:
diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C
similarity index 100%
rename from src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C
rename to src/thermophysicalModels/basic/rhoThermo/rhoThermo.C
diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H
similarity index 100%
rename from src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H
rename to src/thermophysicalModels/basic/rhoThermo/rhoThermo.H
diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C
similarity index 100%
rename from src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C
rename to src/thermophysicalModels/basic/rhoThermo/rhoThermos.C
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index c53c6e20cb..4e3a2fb252 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "chemistryModel.H"
-#include "chemistrySolver.H"
 #include "reactingMixture.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -568,6 +567,8 @@ Foam::chemistryModel<CompType, ThermoType>::tc() const
     );
 
     scalarField& tc = ttc();
+    const scalarField& T = this->thermo().T();
+    const scalarField& p = this->thermo().p();
 
     const label nReaction = reactions_.size();
 
@@ -576,8 +577,8 @@ Foam::chemistryModel<CompType, ThermoType>::tc() const
         forAll(rho, celli)
         {
             scalar rhoi = rho[celli];
-            scalar Ti = this->thermo().T()[celli];
-            scalar pi = this->thermo().p()[celli];
+            scalar Ti = T[celli];
+            scalar pi = p[celli];
             scalarField c(nSpecie_);
             scalar cSum = 0.0;
 
@@ -716,11 +717,14 @@ void Foam::chemistryModel<CompType, ThermoType>::calculate()
         this->thermo().rho()
     );
 
+    const scalarField& T = this->thermo().T();
+    const scalarField& p = this->thermo().p();
+
     forAll(rho, celli)
     {
         const scalar rhoi = rho[celli];
-        const scalar Ti = this->thermo().T()[celli];
-        const scalar pi = this->thermo().p()[celli];
+        const scalar Ti = T[celli];
+        const scalar pi = p[celli];
 
         scalarField c(nSpecie_, 0.0);
         for (label i=0; i<nSpecie_; i++)
@@ -771,13 +775,16 @@ Foam::scalar Foam::chemistryModel<CompType, ThermoType>::solve
 
     tmp<volScalarField> thc = this->thermo().hc();
     const scalarField& hc = thc();
+    const scalarField& he = this->thermo().he();
+    const scalarField& T = this->thermo().T();
+    const scalarField& p = this->thermo().p();
 
     forAll(rho, celli)
     {
         const scalar rhoi = rho[celli];
-        const scalar hi = this->thermo().he()[celli] + hc[celli];
-        const scalar pi = this->thermo().p()[celli];
-        scalar Ti = this->thermo().T()[celli];
+        const scalar hi = he[celli] + hc[celli];
+        const scalar pi = p[celli];
+        scalar Ti = T[celli];
 
         scalarField c(nSpecie_, 0.0);
         scalarField c0(nSpecie_, 0.0);
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
index a9e9a08089..bc687c1390 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
@@ -25,7 +25,6 @@ License
 
 #include "psiChemistryModel.H"
 #include "fvMesh.H"
-#include "Time.H"
 
 /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
 
@@ -35,6 +34,7 @@ namespace Foam
     defineRunTimeSelectionTable(psiChemistryModel, fvMesh);
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::psiChemistryModel::psiChemistryModel
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
index f3ff557e39..59c8f270e4 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
@@ -25,7 +25,6 @@ License
 
 #include "rhoChemistryModel.H"
 #include "fvMesh.H"
-#include "Time.H"
 
 /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
 
@@ -35,6 +34,7 @@ namespace Foam
     defineRunTimeSelectionTable(rhoChemistryModel, fvMesh);
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::rhoChemistryModel::rhoChemistryModel
diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
index aaa301f345..f04b3814c2 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
@@ -135,33 +135,39 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const
         case SOLIDTHERMO:
         {
             // Get the coupling information from the mappedPatchBase
-            const mappedPatchBase& mpp =
-                refCast<const mappedPatchBase>
-                (
-                    patch_.patch()
-                );
+            // const mappedPatchBase& mpp =
+            //     refCast<const mappedPatchBase>
+            //     (
+            //         patch_.patch()
+            //     );
 
-            const polyMesh& nbrMesh = mpp.sampleMesh();
+            // const polyMesh& nbrMesh = mpp.sampleMesh();
 
-            const solidThermo& thermo =
-                nbrMesh.lookupObject<solidThermo>
-                (
-                    "thermophysicalProperties"
-                );
+            // const solidThermo& thermo =
+            //     nbrMesh.lookupObject<solidThermo>
+            //     (
+            //         "thermophysicalProperties"
+            //     );
 
             // Force recalculation of mapping and schedule
-            const mapDistribute& distMap = mpp.map();
+            // const mapDistribute& distMap = mpp.map();
 
-            const fvPatch& nbrPatch = refCast<const fvMesh>
+            // const fvPatch& nbrPatch = refCast<const fvMesh>
+            // (
+            //     nbrMesh
+            // ).boundary()[mpp.samplePolyPatch().index()];
+
+            // scalarField emissivity(thermo.emissivity(nbrPatch.index()));
+            // distMap.distribute(emissivity);
+
+            // return emissivity;
+            FatalErrorIn
             (
-                nbrMesh
-            ).boundary()[mpp.samplePolyPatch().index()];
-
-            scalarField emissivity(thermo.emissivity(nbrPatch.index()));
-            distMap.distribute(emissivity);
-
-            return emissivity;
+                "radiationCoupledBase::emissivity(const scalarField&)"
+            )   << "Solid radiation properties temporarily removed"
+                << exit(FatalError);
 
+            return scalarField(0);
         }
         break;
 
@@ -176,8 +182,7 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const
             FatalErrorIn
             (
                 "radiationCoupledBase::emissivity(const scalarField&)"
-            )
-                << "Unimplemented method " << method_ << endl
+            )   << "Unimplemented method " << method_ << endl
                 << "Please set 'emissivity' to one of "
                 << emissivityMethodTypeNames_.toc()
                 << " and 'emissivityName' to the name of the volScalar"
@@ -185,6 +190,7 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const
         }
         break;
     }
+
     return scalarField(0);
 }
 
diff --git a/src/thermophysicalModels/reactionThermo/Make/files b/src/thermophysicalModels/reactionThermo/Make/files
index 79a33db51d..e4e8c49e2b 100644
--- a/src/thermophysicalModels/reactionThermo/Make/files
+++ b/src/thermophysicalModels/reactionThermo/Make/files
@@ -4,14 +4,14 @@ chemistryReaders/chemistryReader/makeChemistryReaders.C
 
 mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
 
-psiReactionThermo/psiReactionThermo/psiReactionThermo.C
-psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C
+psiReactionThermo/psiReactionThermo.C
+psiReactionThermo/psiReactionThermos.C
 
-psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C
-psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C
+psiuReactionThermo/psiuReactionThermo.C
+psiuReactionThermo/psiuReactionThermos.C
 
-rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C
-rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C
+rhoReactionThermo/rhoReactionThermo.C
+rhoReactionThermo/rhoReactionThermos.C
 
 derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C
 derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C
diff --git a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
index 296dbe7a9a..eb539a02ae 100644
--- a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
@@ -34,7 +34,7 @@ License
 #define makeReactionMixtureThermo(BaseThermo,CThermo,MixtureThermo,Mixture,ThermoPhys)   \
                                                                                \
 typedef MixtureThermo                                                          \
-<                                                                              \
+<   CThermo,                                                                           \
     SpecieMixture                                                              \
     <                                                                          \
         Mixture                                                                \
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.C
deleted file mode 100644
index 81fa02f9fe..0000000000
--- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.C
+++ /dev/null
@@ -1,147 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "hePsiReactionThermo.H"
-#include "fvMesh.H"
-#include "fixedValueFvPatchFields.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class MixtureType>
-void Foam::hePsiReactionThermo<MixtureType>::calculate()
-{
-    const scalarField& hCells = this->he_.internalField();
-    const scalarField& pCells = this->p_.internalField();
-
-    scalarField& TCells = this->T_.internalField();
-    scalarField& psiCells = this->psi_.internalField();
-    scalarField& muCells = this->mu_.internalField();
-    scalarField& alphaCells = this->alpha_.internalField();
-
-    forAll(TCells, celli)
-    {
-        const typename MixtureType::thermoType& mixture =
-            this->cellMixture(celli);
-
-        TCells[celli] = mixture.THE
-        (
-            hCells[celli],
-            pCells[celli],
-            TCells[celli]
-        );
-
-        psiCells[celli] = mixture.psi(pCells[celli], TCells[celli]);
-
-        muCells[celli] = mixture.mu(pCells[celli], TCells[celli]);
-        alphaCells[celli] = mixture.alphah(pCells[celli], TCells[celli]);
-    }
-
-    forAll(this->T_.boundaryField(), patchi)
-    {
-        fvPatchScalarField& pp = this->p_.boundaryField()[patchi];
-        fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
-        fvPatchScalarField& ppsi = this->psi_.boundaryField()[patchi];
-
-        fvPatchScalarField& ph = this->he_.boundaryField()[patchi];
-
-        fvPatchScalarField& pmu_ = this->mu_.boundaryField()[patchi];
-        fvPatchScalarField& palpha_ = this->alpha_.boundaryField()[patchi];
-
-        if (pT.fixesValue())
-        {
-            forAll(pT, facei)
-            {
-                const typename MixtureType::thermoType& mixture =
-                    this->patchFaceMixture(patchi, facei);
-
-                ph[facei] = mixture.HE(pp[facei], pT[facei]);
-
-                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
-                pmu_[facei] = mixture.mu(pp[facei], pT[facei]);
-                palpha_[facei] = mixture.alphah(pp[facei], pT[facei]);
-            }
-        }
-        else
-        {
-            forAll(pT, facei)
-            {
-                const typename MixtureType::thermoType& mixture =
-                    this->patchFaceMixture(patchi, facei);
-
-                pT[facei] = mixture.THE(ph[facei], pp[facei], pT[facei]);
-
-                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
-                pmu_[facei] = mixture.mu(pp[facei], pT[facei]);
-                palpha_[facei] = mixture.alphah(pp[facei], pT[facei]);
-            }
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class MixtureType>
-Foam::hePsiReactionThermo<MixtureType>::hePsiReactionThermo(const fvMesh& mesh)
-:
-    heThermo<psiReactionThermo, MixtureType>(mesh)
-{
-    calculate();
-
-    // Switch on saving old time
-    this->psi_.oldTime();
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class MixtureType>
-Foam::hePsiReactionThermo<MixtureType>::~hePsiReactionThermo()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class MixtureType>
-void Foam::hePsiReactionThermo<MixtureType>::correct()
-{
-    if (debug)
-    {
-        Info<< "entering hePsiReactionThermo<MixtureType>::correct()" << endl;
-    }
-
-    // force the saving of the old-time values
-    this->psi_.oldTime();
-
-    calculate();
-
-    if (debug)
-    {
-        Info<< "exiting hePsiReactionThermo<MixtureType>::correct()" << endl;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.C
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.C
rename to src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.C
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.H b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.H
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.H
rename to src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.H
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C
similarity index 92%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C
rename to src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C
index 2b668ca634..4e65f3a24c 100644
--- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C
+++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C
@@ -26,7 +26,7 @@ License
 #include "makeReactionThermo.H"
 
 #include "psiReactionThermo.H"
-#include "hePsiReactionThermo.H"
+#include "hePsiThermo.H"
 
 #include "specie.H"
 #include "perfectGas.H"
@@ -59,7 +59,7 @@ makeReactionThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     homogeneousMixture,
     constTransport,
     sensibleEnthalpy,
@@ -72,7 +72,7 @@ makeReactionThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     inhomogeneousMixture,
     constTransport,
     sensibleEnthalpy,
@@ -85,7 +85,7 @@ makeReactionThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     veryInhomogeneousMixture,
     constTransport,
     sensibleEnthalpy,
@@ -101,7 +101,7 @@ makeReactionThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     homogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -114,7 +114,7 @@ makeReactionThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     inhomogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -127,7 +127,7 @@ makeReactionThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     veryInhomogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -143,7 +143,7 @@ makeReactionThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     homogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -156,7 +156,7 @@ makeReactionThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     inhomogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -169,7 +169,7 @@ makeReactionThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     veryInhomogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -185,7 +185,7 @@ makeReactionMixtureThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     multiComponentMixture,
     constGasThermoPhysics
 );
@@ -194,7 +194,7 @@ makeReactionMixtureThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     multiComponentMixture,
     gasThermoPhysics
 );
@@ -206,7 +206,7 @@ makeReactionMixtureThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     reactingMixture,
     constGasThermoPhysics
 );
@@ -215,7 +215,7 @@ makeReactionMixtureThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     reactingMixture,
     gasThermoPhysics
 );
@@ -224,7 +224,7 @@ makeReactionMixtureThermo
 (
     psiThermo,
     psiReactionThermo,
-    hePsiReactionThermo,
+    hePsiThermo,
     singleStepReactingMixture,
     gasThermoPhysics
 );
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
similarity index 90%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.C
rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
index b0705c3261..6c7abc3150 100644
--- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
@@ -23,14 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "heheuReactionThermo.H"
+#include "heheuPsiThermo.H"
 #include "fvMesh.H"
 #include "fixedValueFvPatchFields.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class MixtureType>
-void Foam::heheuReactionThermo<MixtureType>::calculate()
+template<class BasicPsiThermo, class MixtureType>
+void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::calculate()
 {
     const scalarField& hCells = this->he_.internalField();
     const scalarField& heuCells = this->heu_.internalField();
@@ -118,8 +118,8 @@ void Foam::heheuReactionThermo<MixtureType>::calculate()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class MixtureType>
-Foam::heheuReactionThermo<MixtureType>::heheuReactionThermo(const fvMesh& mesh)
+template<class BasicPsiThermo, class MixtureType>
+Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::heheuPsiThermo(const fvMesh& mesh)
 :
     heThermo<psiuReactionThermo, MixtureType>(mesh),
     Tu_
@@ -188,19 +188,19 @@ Foam::heheuReactionThermo<MixtureType>::heheuReactionThermo(const fvMesh& mesh)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class MixtureType>
-Foam::heheuReactionThermo<MixtureType>::~heheuReactionThermo()
+template<class BasicPsiThermo, class MixtureType>
+Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::~heheuPsiThermo()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class MixtureType>
-void Foam::heheuReactionThermo<MixtureType>::correct()
+template<class BasicPsiThermo, class MixtureType>
+void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()
 {
     if (debug)
     {
-        Info<< "entering heheuReactionThermo<MixtureType>::correct()" << endl;
+        Info<< "entering heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()" << endl;
     }
 
     // force the saving of the old-time values
@@ -210,14 +210,14 @@ void Foam::heheuReactionThermo<MixtureType>::correct()
 
     if (debug)
     {
-        Info<< "exiting heheuReactionThermo<MixtureType>::correct()" << endl;
+        Info<< "exiting heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()" << endl;
     }
 }
 
 
-template<class MixtureType>
+template<class BasicPsiThermo, class MixtureType>
 Foam::tmp<Foam::scalarField>
-Foam::heheuReactionThermo<MixtureType>::heu
+Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::heu
 (
     const scalarField& p,
     const scalarField& Tu,
@@ -236,9 +236,9 @@ Foam::heheuReactionThermo<MixtureType>::heu
 }
 
 
-template<class MixtureType>
+template<class BasicPsiThermo, class MixtureType>
 Foam::tmp<Foam::scalarField>
-Foam::heheuReactionThermo<MixtureType>::heu
+Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::heu
 (
     const scalarField& p,
     const scalarField& Tu,
@@ -258,9 +258,9 @@ Foam::heheuReactionThermo<MixtureType>::heu
 }
 
 
-template<class MixtureType>
+template<class BasicPsiThermo, class MixtureType>
 Foam::tmp<Foam::volScalarField>
-Foam::heheuReactionThermo<MixtureType>::Tb() const
+Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::Tb() const
 {
     tmp<volScalarField> tTb
     (
@@ -314,9 +314,9 @@ Foam::heheuReactionThermo<MixtureType>::Tb() const
 }
 
 
-template<class MixtureType>
+template<class BasicPsiThermo, class MixtureType>
 Foam::tmp<Foam::volScalarField>
-Foam::heheuReactionThermo<MixtureType>::psiu() const
+Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psiu() const
 {
     tmp<volScalarField> tpsiu
     (
@@ -365,9 +365,9 @@ Foam::heheuReactionThermo<MixtureType>::psiu() const
 }
 
 
-template<class MixtureType>
+template<class BasicPsiThermo, class MixtureType>
 Foam::tmp<Foam::volScalarField>
-Foam::heheuReactionThermo<MixtureType>::psib() const
+Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psib() const
 {
     tmp<volScalarField> tpsib
     (
@@ -417,9 +417,9 @@ Foam::heheuReactionThermo<MixtureType>::psib() const
 }
 
 
-template<class MixtureType>
+template<class BasicPsiThermo, class MixtureType>
 Foam::tmp<Foam::volScalarField>
-Foam::heheuReactionThermo<MixtureType>::muu() const
+Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::muu() const
 {
     tmp<volScalarField> tmuu
     (
@@ -472,9 +472,9 @@ Foam::heheuReactionThermo<MixtureType>::muu() const
 }
 
 
-template<class MixtureType>
+template<class BasicPsiThermo, class MixtureType>
 Foam::tmp<Foam::volScalarField>
-Foam::heheuReactionThermo<MixtureType>::mub() const
+Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::mub() const
 {
     tmp<volScalarField> tmub
     (
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.H b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H
similarity index 90%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.H
rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H
index 93e6cc7041..2a9645df0e 100644
--- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H
@@ -36,7 +36,6 @@ SourceFiles
 #define heheuReactionThermo_H
 
 #include "heThermo.H"
-#include "psiuReactionThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,13 +43,13 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class heheuReactionThermo Declaration
+                      Class heheuPsiThermo Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class MixtureType>
-class heheuReactionThermo
+template<class BasicPsiThermo, class MixtureType>
+class heheuPsiThermo
 :
-    public heThermo<psiuReactionThermo, MixtureType>
+    public heThermo<BasicPsiThermo, MixtureType>
 {
     // Private Member Functions
 
@@ -63,23 +62,26 @@ class heheuReactionThermo
         void calculate();
 
         //- Construct as copy (not implemented)
-        heheuReactionThermo(const heheuReactionThermo<MixtureType>&);
+        heheuPsiThermo
+        (
+            const heheuPsiThermo<BasicPsiThermo, MixtureType>&
+        );
 
 
 public:
 
     //- Runtime type information
-    TypeName("heheuReactionThermo");
+    TypeName("heheuPsiThermo");
 
 
     // Constructors
 
         //- Construct from mesh
-        heheuReactionThermo(const fvMesh&);
+        heheuPsiThermo(const fvMesh&);
 
 
     //- Destructor
-    virtual ~heheuReactionThermo();
+    virtual ~heheuPsiThermo();
 
 
     // Member functions
@@ -155,7 +157,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
-#   include "heheuReactionThermo.C"
+#   include "heheuPsiThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C
rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.H b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.H
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.H
rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.H
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C
similarity index 93%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C
rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C
index f5c65f483d..517a74c79b 100644
--- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "psiuReactionThermo.H"
-#include "heheuReactionThermo.H"
+#include "heheuPsiThermo.H"
 
 #include "makeReactionThermo.H"
 #include "addToRunTimeSelectionTable.H"
@@ -56,7 +56,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     homogeneousMixture,
     constTransport,
     absoluteEnthalpy,
@@ -69,7 +69,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     inhomogeneousMixture,
     constTransport,
     absoluteEnthalpy,
@@ -82,7 +82,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     veryInhomogeneousMixture,
     constTransport,
     absoluteEnthalpy,
@@ -95,7 +95,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     homogeneousMixture,
     sutherlandTransport,
     absoluteEnthalpy,
@@ -108,7 +108,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     inhomogeneousMixture,
     sutherlandTransport,
     absoluteEnthalpy,
@@ -121,7 +121,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     veryInhomogeneousMixture,
     sutherlandTransport,
     absoluteEnthalpy,
@@ -134,7 +134,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     egrMixture,
     constTransport,
     absoluteEnthalpy,
@@ -147,7 +147,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     egrMixture,
     sutherlandTransport,
     absoluteEnthalpy,
diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.C
deleted file mode 100644
index b27fd9c958..0000000000
--- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.C
+++ /dev/null
@@ -1,145 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "heRhoReactionThermo.H"
-#include "fvMesh.H"
-#include "fixedValueFvPatchFields.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class MixtureType>
-void Foam::heRhoReactionThermo<MixtureType>::calculate()
-{
-    const scalarField& hCells = this->he_.internalField();
-    const scalarField& pCells = this->p_.internalField();
-
-    scalarField& TCells = this->T_.internalField();
-    scalarField& psiCells = this->psi_.internalField();
-    scalarField& rhoCells = this->rho_.internalField();
-    scalarField& muCells = this->mu_.internalField();
-    scalarField& alphaCells = this->alpha_.internalField();
-
-    forAll(TCells, celli)
-    {
-        const typename MixtureType::thermoType& mixture =
-            this->cellMixture(celli);
-
-        TCells[celli] = mixture.THE
-        (
-            hCells[celli],
-            pCells[celli],
-            TCells[celli]
-        );
-        psiCells[celli] = mixture.psi(pCells[celli], TCells[celli]);
-        rhoCells[celli] = mixture.rho(pCells[celli], TCells[celli]);
-
-        muCells[celli] = mixture.mu(pCells[celli], TCells[celli]);
-        alphaCells[celli] = mixture.alphah(pCells[celli], TCells[celli]);
-    }
-
-    forAll(this->T_.boundaryField(), patchi)
-    {
-        fvPatchScalarField& pp = this->p_.boundaryField()[patchi];
-        fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
-        fvPatchScalarField& ppsi = this->psi_.boundaryField()[patchi];
-        fvPatchScalarField& prho = this->rho_.boundaryField()[patchi];
-
-        fvPatchScalarField& ph = this->he_.boundaryField()[patchi];
-
-        fvPatchScalarField& pmu_ = this->mu_.boundaryField()[patchi];
-        fvPatchScalarField& palpha_ = this->alpha_.boundaryField()[patchi];
-
-        if (pT.fixesValue())
-        {
-            forAll(pT, facei)
-            {
-                const typename MixtureType::thermoType& mixture =
-                    this->patchFaceMixture(patchi, facei);
-
-                ph[facei] = mixture.HE(pp[facei], pT[facei]);
-
-                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
-                prho[facei] = mixture.rho(pp[facei], pT[facei]);
-                pmu_[facei] = mixture.mu(pp[facei], pT[facei]);
-                palpha_[facei] = mixture.alphah(pp[facei], pT[facei]);
-            }
-        }
-        else
-        {
-            forAll(pT, facei)
-            {
-                const typename MixtureType::thermoType& mixture =
-                    this->patchFaceMixture(patchi, facei);
-
-                pT[facei] = mixture.THE(ph[facei], pp[facei], pT[facei]);
-
-                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
-                prho[facei] = mixture.rho(pp[facei], pT[facei]);
-                pmu_[facei] = mixture.mu(pp[facei], pT[facei]);
-                palpha_[facei] = mixture.alphah(pp[facei], pT[facei]);
-            }
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class MixtureType>
-Foam::heRhoReactionThermo<MixtureType>::heRhoReactionThermo(const fvMesh& mesh)
-:
-    heThermo<rhoReactionThermo, MixtureType>(mesh)
-{
-    calculate();
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class MixtureType>
-Foam::heRhoReactionThermo<MixtureType>::~heRhoReactionThermo()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class MixtureType>
-void Foam::heRhoReactionThermo<MixtureType>::correct()
-{
-    if (debug)
-    {
-        Info<< "entering heRhoReactionThermo<MixtureType>::correct()" << endl;
-    }
-
-    calculate();
-
-    if (debug)
-    {
-        Info<< "exiting heRhoReactionThermo<MixtureType>::correct()" << endl;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.H b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.H
deleted file mode 100644
index ab7ef09117..0000000000
--- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.H
+++ /dev/null
@@ -1,100 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::heRhoReactionThermo
-
-Description
-    Foam::heRhoReactionThermo
-
-SourceFiles
-    heRhoReactionThermo.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef heRhoReactionThermo_H
-#define heRhoReactionThermo_H
-
-#include "heThermo.H"
-#include "rhoReactionThermo.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                      Class heRhoReactionThermo Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class MixtureType>
-class heRhoReactionThermo
-:
-    public heThermo<rhoReactionThermo, MixtureType>
-{
-    // Private Member Functions
-
-        void calculate();
-
-        //- Construct as copy (not implemented)
-        heRhoReactionThermo(const heRhoReactionThermo<MixtureType>&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("heRhoReactionThermo");
-
-
-    // Constructors
-
-        //- Construct from mesh
-        heRhoReactionThermo(const fvMesh&);
-
-
-    //- Destructor
-    virtual ~heRhoReactionThermo();
-
-
-    // Member functions
-
-        //- Update properties
-        virtual void correct();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "heRhoReactionThermo.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.C
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C
rename to src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.C
diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.H b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.H
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.H
rename to src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.H
diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C
similarity index 90%
rename from src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C
rename to src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C
index 4514f9586a..6dbf589bce 100644
--- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C
+++ b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C
@@ -26,7 +26,7 @@ License
 #include "makeReactionThermo.H"
 
 #include "rhoReactionThermo.H"
-#include "heRhoReactionThermo.H"
+#include "heRhoThermo.H"
 
 #include "specie.H"
 #include "perfectGas.H"
@@ -59,7 +59,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     homogeneousMixture,
     constTransport,
     sensibleEnthalpy,
@@ -72,7 +72,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     inhomogeneousMixture,
     constTransport,
     sensibleEnthalpy,
@@ -85,7 +85,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     veryInhomogeneousMixture,
     constTransport,
     sensibleEnthalpy,
@@ -98,7 +98,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     homogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -111,7 +111,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     inhomogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -124,7 +124,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     veryInhomogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -138,7 +138,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     homogeneousMixture,
     constTransport,
     sensibleEnthalpy,
@@ -151,7 +151,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     inhomogeneousMixture,
     constTransport,
     sensibleEnthalpy,
@@ -164,7 +164,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     veryInhomogeneousMixture,
     constTransport,
     sensibleEnthalpy,
@@ -177,7 +177,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     homogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -190,7 +190,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     inhomogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -203,7 +203,7 @@ makeReactionThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     veryInhomogeneousMixture,
     sutherlandTransport,
     sensibleEnthalpy,
@@ -219,7 +219,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     multiComponentMixture,
     constGasThermoPhysics
 );
@@ -228,7 +228,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     multiComponentMixture,
     gasThermoPhysics
 );
@@ -237,7 +237,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     multiComponentMixture,
     constIncompressibleGasThermoPhysics
 );
@@ -246,7 +246,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     multiComponentMixture,
     incompressibleGasThermoPhysics
 );
@@ -255,7 +255,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     multiComponentMixture,
     icoPoly8ThermoPhysics
 );
@@ -267,7 +267,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     reactingMixture,
     constGasThermoPhysics
 );
@@ -276,7 +276,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     reactingMixture,
     gasThermoPhysics
 );
@@ -285,7 +285,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     reactingMixture,
     constIncompressibleGasThermoPhysics
 );
@@ -294,7 +294,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     reactingMixture,
     incompressibleGasThermoPhysics
 );
@@ -303,7 +303,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     reactingMixture,
     icoPoly8ThermoPhysics
 );
@@ -312,7 +312,7 @@ makeReactionMixtureThermo
 (
     rhoThermo,
     rhoReactionThermo,
-    heRhoReactionThermo,
+    heRhoThermo,
     singleStepReactingMixture,
     gasThermoPhysics
 );
diff --git a/src/thermophysicalModels/solidSpecie/Make/files b/src/thermophysicalModels/solidSpecie/Make/files
index a444269f11..0e8165b9ad 100644
--- a/src/thermophysicalModels/solidSpecie/Make/files
+++ b/src/thermophysicalModels/solidSpecie/Make/files
@@ -1,4 +1,4 @@
 reaction/Reactions/solidReaction/solidReaction.C
-reaction/reactions/makeSolidReactionThermoReactions.C
+reaction/reactions/makeSolidReactions.C
 
 LIB = $(FOAM_LIBBIN)/libsolidSpecie
diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermo.H b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
similarity index 97%
rename from src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermo.H
rename to src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
index 3d9a9a738f..45bd04abe2 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermo.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InClass
-    Foam::makeSolidReactionThermo
+    Foam::makeSolidReaction
 
 Description
-    Macros for instantiating reactions on given solid thermo packages
+    Macros for instantiating reactions for solid
 
 \*---------------------------------------------------------------------------*/
 
@@ -79,5 +79,4 @@ namespace Foam
 
 #endif
 
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermoReactions.C b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactions.C
similarity index 97%
rename from src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermoReactions.C
rename to src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactions.C
index d0e19b443b..6962ad16f6 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermoReactions.C
+++ b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactions.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "makeSolidReactionThermo.H"
+#include "makeSolidReaction.H"
 #include "solidArrheniusReactionRate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidThermo/Make/files b/src/thermophysicalModels/solidThermo/Make/files
index 9a6e5dab61..8710badef6 100644
--- a/src/thermophysicalModels/solidThermo/Make/files
+++ b/src/thermophysicalModels/solidThermo/Make/files
@@ -1,10 +1,11 @@
 solidThermo/solidThermo.C
 solidThermo/solidThermoNew.C
+solidThermo/solidThermos.C
 
 mixtures/basicSolidMixture/basicSolidMixture.C
 
 solidReactionThermo/solidReactionThermo.C
 solidReactionThermo/solidReactionThermoNew.C
-heSolidThermo/heSolidThermos.C
+solidReactionThermo/solidReactionThermos.C
 
 LIB = $(FOAM_LIBBIN)/libsolidThermo
diff --git a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H
index 93fb35276b..897832cbd1 100644
--- a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H
+++ b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H
@@ -191,21 +191,9 @@ public:
             //- Density
             virtual scalar rho(scalar p, scalar T, label celli) const = 0;
 
-            //- Absorption coefficient
-            virtual scalar kappaRad(scalar p, scalar T, label celli) const = 0;
-
-            //- Scatter coefficient
-            virtual scalar sigmaS(scalar p, scalar T, label celli) const = 0;
-
             //- Thermal conductivity
             virtual scalar kappa(scalar p, scalar T, label celli) const = 0;
 
-            //- Emissivity coefficient
-            virtual scalar emissivity
-            (
-                scalar p, scalar T, label celli
-            ) const = 0;
-
             //- Specific heat capacity
             virtual scalar Cp(scalar p, scalar T, label celli) const = 0;
 };
@@ -217,7 +205,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "basicSolidMixtureI.H"
+#include "basicSolidMixtureI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C
index 49618c7441..666fd8a66c 100644
--- a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C
+++ b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C
@@ -29,7 +29,6 @@ Description
 #include "basicMixture.H"
 #include "makeBasicMixture.H"
 
-
 #include "rhoConst.H"
 
 #include "hConstThermo.H"
@@ -39,8 +38,6 @@ Description
 #include "constAnIsoSolidTransport.H"
 #include "exponentialSolidTransport.H"
 
-#include "constSolidRad.H"
-
 #include "sensibleInternalEnergy.H"
 #include "sensibleEnthalpy.H"
 #include "thermo.H"
diff --git a/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C b/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C
index 261bc66123..e15ac919ca 100644
--- a/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C
+++ b/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C
@@ -316,36 +316,6 @@ Foam::scalar Foam::multiComponentSolidMixture<ThermoType>::rho
 }
 
 
-template<class ThermoType>
-Foam::scalar Foam::multiComponentSolidMixture<ThermoType>::kappaRad
-(
-    scalar p, scalar T, label celli
-) const
-{
-    scalar tmp = 0.0;
-    forAll(solidData_, i)
-    {
-        tmp += solidData_[i].kappaRad(T)*X(i, celli, p, T);
-    }
-    return tmp;
-}
-
-
-template<class ThermoType>
-Foam::scalar Foam::multiComponentSolidMixture<ThermoType>::sigmaS
-(
-    scalar p, scalar T, label celli
-) const
-{
-    scalar tmp = 0.0;
-    forAll(solidData_, i)
-    {
-        tmp += solidData_[i].sigmaS(T)*X(i, celli, p, T);
-    }
-    return tmp;
-}
-
-
 template<class ThermoType>
 Foam::scalar Foam::multiComponentSolidMixture<ThermoType>::kappa
 (
@@ -361,21 +331,6 @@ Foam::scalar Foam::multiComponentSolidMixture<ThermoType>::kappa
 }
 
 
-template<class ThermoType>
-Foam::scalar Foam::multiComponentSolidMixture<ThermoType>::emissivity
-(
-    scalar p, scalar T, label celli
-) const
-{
-    scalar tmp = 0.0;
-    forAll(solidData_, i)
-    {
-        tmp += solidData_[i].emissivity(T)*X(i, celli, p, T);
-    }
-    return tmp;
-}
-
-
 template<class ThermoType>
 Foam::scalar Foam::multiComponentSolidMixture<ThermoType>::Cp
 (
diff --git a/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H b/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
index 4b772f4233..acdf0391b5 100644
--- a/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
+++ b/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
@@ -208,21 +208,11 @@ public:
             //- Density
             virtual scalar rho(scalar p, scalar T, label celli) const;
 
-            //- Absorption coefficient
-            virtual scalar kappaRad(scalar p, scalar T, label celli) const;
-
-            //- Scatter coefficient
-            virtual scalar sigmaS(scalar p, scalar T, label celli) const;
-
             //- Thermal conductivity
             virtual scalar kappa(scalar p, scalar T, label celli) const;
 
-            //- Emissivity coefficient
-            virtual scalar emissivity(scalar p, scalar T, label celli) const;
-
             //- Specific heat capacity
             virtual scalar Cp(scalar p, scalar T, label celli) const;
-
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.H b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C
similarity index 52%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.H
rename to src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C
index 1067f0610a..cbfa81b30e 100644
--- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C
@@ -21,80 +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/>.
 
-Class
-    Foam::hePsiReactionThermo
-
-Description
-    Foam::hePsiReactionThermo
-
-SourceFiles
-    hePsiReactionThermo.C
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef hePsiReactionThermo_H
-#define hePsiReactionThermo_H
+#include "makeSolidThermo.H"
+#include "solidReactionThermo.H"
+#include "heSolidThermo.H"
+
+#include "specie.H"
+#include "rhoConst.H"
+#include "hConstThermo.H"
+#include "hExponentialThermo.H"
+#include "constIsoSolidTransport.H"
+#include "constAnIsoSolidTransport.H"
+#include "exponentialSolidTransport.H"
+#include "reactingSolidMixture.H"
+#include "sensibleEnthalpy.H"
+#include "thermo.H"
 
-#include "heThermo.H"
-#include "psiReactionThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-/*---------------------------------------------------------------------------*\
-                      Class hePsiReactionThermo Declaration
-\*---------------------------------------------------------------------------*/
+/* * * * * * * * * * * * * * * * * Enthalpy-based * * * * * * * * * * * * * */
 
-template<class MixtureType>
-class hePsiReactionThermo
-:
-    public heThermo<psiReactionThermo, MixtureType>
-{
-    // Private Member Functions
-
-        void calculate();
-
-        //- Construct as copy (not implemented)
-        hePsiReactionThermo(const hePsiReactionThermo<MixtureType>&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("hePsiReactionThermo");
-
-
-    // Constructors
-
-        //- Construct from mesh
-        hePsiReactionThermo(const fvMesh&);
-
-
-    //- Destructor
-    virtual ~hePsiReactionThermo();
-
-
-    // Member functions
-
-        //- Update properties
-        virtual void correct();
-};
+makeSolidThermo
+(
+    solidReactionThermo,
+    heSolidThermo,
+    reactingSolidMixture,
+    constIsoSolidTransport,
+    sensibleEnthalpy,
+    hConstThermo,
+    rhoConst,
+    specie
+);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "hePsiReactionThermo.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
similarity index 53%
rename from src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C
rename to src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
index 3ce0c43e14..55f9bc1999 100644
--- a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
@@ -230,192 +230,6 @@ Foam::heSolidThermo<BasicSolidThermo, MixtureType>::Kappa() const
 }
 
 
-template<class BasicSolidThermo, class MixtureType>
-Foam::tmp<Foam::volScalarField>
-Foam::heSolidThermo<BasicSolidThermo, MixtureType>::kappaRad() const
-{
-    const fvMesh& mesh = this->T_.mesh();
-
-    tmp<volScalarField> tkappaRad
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "kappaRad",
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh,
-            inv(dimLength)
-        )
-    );
-
-    volScalarField& kappaRad = tkappaRad();
-    scalarField& kappaRadCells = kappaRad.internalField();
-    const scalarField& TCells = this->T_.internalField();
-    const scalarField& pCells = this->p_.internalField();
-
-    forAll(kappaRadCells, celli)
-    {
-        kappaRadCells[celli] =
-            this->cellVolMixture
-            (
-                pCells[celli],
-                TCells[celli],
-                celli
-            ).kappaRad(TCells[celli]);
-    }
-
-    forAll(kappaRad.boundaryField(), patchi)
-    {
-        scalarField& kappaRadp = kappaRad.boundaryField()[patchi];
-        const scalarField& pT = this->T_.boundaryField()[patchi];
-        const scalarField& pp = this->p_.boundaryField()[patchi];
-
-        forAll(kappaRadp, facei)
-        {
-            kappaRadp[facei] =
-                this->patchFaceVolMixture
-                (
-                    pp[facei],
-                    pT[facei],
-                    patchi,
-                    facei
-                ).kappaRad(pT[facei]);
-        }
-    }
-
-    return tkappaRad;
-}
-
-
-template<class BasicSolidThermo, class MixtureType>
-Foam::tmp<Foam::volScalarField>
-Foam::heSolidThermo<BasicSolidThermo, MixtureType>::sigmaS() const
-{
-    const fvMesh& mesh = this->T_.mesh();
-
-    tmp<volScalarField> tsigmaS
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "sigmaS",
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh,
-            inv(dimLength)
-        )
-    );
-
-    volScalarField& sigmaS = tsigmaS();
-    scalarField& sigmaSCells = sigmaS.internalField();
-    const scalarField& TCells = this->T_.internalField();
-    const scalarField& pCells = this->p_.internalField();
-
-    forAll(sigmaSCells, celli)
-    {
-        sigmaSCells[celli] =
-            this->cellVolMixture
-            (
-                pCells[celli],
-                TCells[celli],
-                celli
-            ).sigmaS(TCells[celli]);
-    }
-
-    forAll(sigmaS.boundaryField(), patchi)
-    {
-        scalarField& sigmaSp = sigmaS.boundaryField()[patchi];
-        const scalarField& pT = this->T_.boundaryField()[patchi];
-        const scalarField& pp = this->p_.boundaryField()[patchi];
-
-        forAll(sigmaSp, facei)
-        {
-            sigmaSp[facei] =
-                this->patchFaceVolMixture
-                (
-                    pp[facei],
-                    pT[facei],
-                    patchi,
-                    facei
-                ).sigmaS(pT[facei]);
-        }
-    }
-
-    return tsigmaS;
-}
-
-
-template<class BasicSolidThermo, class MixtureType>
-Foam::tmp<Foam::volScalarField>
-Foam::heSolidThermo<BasicSolidThermo, MixtureType>::emissivity() const
-{
-    const fvMesh& mesh = this->T_.mesh();
-
-    tmp<volScalarField> temissivity
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "emissivity",
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh,
-            inv(dimLength)
-        )
-    );
-
-    volScalarField& emissivity = temissivity();
-    scalarField& emissivityCells = emissivity.internalField();
-    const scalarField& TCells = this->T_.internalField();
-    const scalarField& pCells = this->p_.internalField();
-
-    forAll(emissivityCells, celli)
-    {
-        emissivityCells[celli] =
-            this->cellVolMixture
-            (
-                pCells[celli],
-                TCells[celli],
-                celli
-            ).emissivity(TCells[celli]);
-    }
-
-    forAll(emissivity.boundaryField(), patchi)
-    {
-        scalarField& emissivityp = emissivity.boundaryField()[patchi];
-        const scalarField& pT = this->T_.boundaryField()[patchi];
-        const scalarField& pp = this->p_.boundaryField()[patchi];
-
-        forAll(emissivityp, facei)
-        {
-            emissivityp[facei] =
-                this->patchFaceVolMixture
-                (
-                    pp[facei],
-                    pT[facei],
-                    patchi,
-                    facei
-                ).emissivity(pT[facei]);
-        }
-    }
-
-    return temissivity;
-}
-
-
 template<class BasicSolidThermo, class MixtureType>
 Foam::tmp<Foam::vectorField>
 Foam::heSolidThermo<BasicSolidThermo, MixtureType>::Kappa
@@ -445,89 +259,4 @@ Foam::heSolidThermo<BasicSolidThermo, MixtureType>::Kappa
 }
 
 
-template<class BasicSolidThermo, class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::heSolidThermo<BasicSolidThermo, MixtureType>::kappaRad
-(
-    const label patchi
-) const
-{
-    const scalarField& Tp = this->T_.boundaryField()[patchi];
-    tmp<scalarField> tKappaRad(new scalarField(Tp.size()));
-    scalarField& KappapRadp = tKappaRad();
-    const scalarField& pp = this->p_.boundaryField()[patchi];
-
-    forAll(Tp, facei)
-    {
-        KappapRadp[facei] =
-            this->patchFaceVolMixture
-            (
-                pp[facei],
-                Tp[facei],
-                patchi,
-                facei
-            ).kappaRad(Tp[facei]);
-    }
-
-    return tKappaRad;
-}
-
-
-template<class BasicSolidThermo, class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::heSolidThermo<BasicSolidThermo, MixtureType>::sigmaS
-(
-    const label patchi
-) const
-{
-    const scalarField& Tp = this->T_.boundaryField()[patchi];
-    tmp<scalarField> tsigmaS(new scalarField(Tp.size()));
-    scalarField& sigmaSp = tsigmaS();
-    const scalarField& pp = this->p_.boundaryField()[patchi];
-
-
-    forAll(Tp, facei)
-    {
-        sigmaSp[facei] =
-            this->patchFaceVolMixture
-            (
-                pp[facei],
-                Tp[facei],
-                patchi,
-                facei
-            ).sigmaS(Tp[facei]);
-    }
-
-    return tsigmaS;
-}
-
-
-template<class BasicSolidThermo, class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::heSolidThermo<BasicSolidThermo, MixtureType>::emissivity
-(
-    const label patchi
-) const
-{
-    const scalarField& Tp = this->T_.boundaryField()[patchi];
-    tmp<scalarField> temissivity(new scalarField(Tp.size()));
-    scalarField& emissivity = temissivity();
-    const scalarField& pp = this->p_.boundaryField()[patchi];
-
-    forAll(Tp, facei)
-    {
-        emissivity[facei] =
-            this->patchFaceVolMixture
-            (
-                pp[facei],
-                Tp[facei],
-                patchi,
-                facei
-            ).emissivity(Tp[facei]);
-    }
-
-    return temissivity;
-}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H
similarity index 81%
rename from src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H
rename to src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H
index f5c5a405be..ee1f9aa010 100644
--- a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H
@@ -25,7 +25,7 @@ Class
     Foam::heSolidThermo
 
 Description
-    Enthalpy, internal energy based for a solid mixture.
+    Energy for a solid mixture
 
 SourceFiles
     heSolidThermo.C
@@ -51,7 +51,6 @@ class heSolidThermo
 :
     public heThermo<BasicSolidThermo, MixtureType>
 {
-
     // Private Member Functions
 
         //- Calculate the thermo variables
@@ -91,29 +90,11 @@ public:
             //- Anisotropic thermal conductivity [W/m/K]
             virtual tmp<volVectorField> Kappa() const;
 
-            //- Absorption coefficient [1/m]
-            virtual tmp<volScalarField> kappaRad() const;
-
-            //- Scatter coefficient
-            virtual tmp<volScalarField> sigmaS() const;
-
-            //- Emissivity coefficient [1/m]
-            virtual tmp<volScalarField> emissivity() const;
-
 
         // Per patch calculation
 
             //- Anisotropic thermal conductivity [W/m/K]
             virtual tmp<vectorField> Kappa(const label patchI) const;
-
-             //- Absorption coefficient [1/m]
-            virtual tmp<scalarField> kappaRad(const label patchI) const;
-
-            //- Scatter coefficient
-            virtual tmp<scalarField> sigmaS(const label patchI) const;
-
-            //- Emissivity coefficient [1/m]
-            virtual tmp<scalarField> emissivity(const label patchI) const;
 };
 
 
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
index 3f44c6b825..2f16507b20 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
@@ -32,79 +32,42 @@ Description
 #ifndef makeSolidThermo_H
 #define makesolidThermo_H
 
-#include "addToRunTimeSelectionTable.H"
-#include "basicThermo.H"
+#include "makeThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSolidThermo(BaseThermo,Cthermo,Mixture,Transport,Radiation,Type,Thermo,EqnOfState,Specie)\
+#define makeSolidThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
                                                                               \
-typedef                                                                       \
-    Transport                                                                 \
-    <                                                                         \
-        Radiation                                                             \
-        <                                                                     \
-            species::thermo                                                   \
-            <                                                                 \
-                Thermo                                                        \
-                <                                                             \
-                    EqnOfState                                                \
-                    <                                                         \
-                        Specie                                                \
-                    >                                                         \
-                >,                                                            \
-                Type                                                          \
-            >                                                                 \
-        >                                                                     \
-    > Transport##Radiation##Type##Thermo##EqnOfState##Specie;                 \
-                                                                              \
-typedef                                                                       \
-    Mixture                                                                   \
-    <                                                                         \
-        Transport##Radiation##Type##Thermo##EqnOfState##Specie                \
-    > Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie;        \
-                                                                              \
-typedef                                                                       \
-    Cthermo                                                                   \
-    <                                                                         \
-        BaseThermo,                                                           \
-        Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie       \
-    > Cthermo##Mixture##Transport##Radiation##Type##Thermo                    \
-          ##EqnOfState##Specie;                                               \
-                                                                              \
-defineTemplateTypeNameAndDebugWithName                                        \
+makeThermoTypedefs                                                            \
 (                                                                             \
-    Cthermo##Mixture##Transport##Radiation##Type##Thermo                      \
-         ##EqnOfState##Specie,                                                \
-    (                                                                         \
-        #Cthermo"<"#Mixture"<"                                                \
-      + Transport##Radiation##Type##Thermo##EqnOfState##Specie::typeName()    \
-      + ">>"                                                                  \
-    ).c_str(),                                                                \
-    0                                                                         \
-);                                                                            \
+    BaseThermo,                                                               \
+    Cthermo,                                                                  \
+    Mixture,                                                                  \
+    Transport,                                                                \
+    Type,                                                                     \
+    Thermo,                                                                   \
+    EqnOfState,                                                               \
+    Specie                                                                    \
+)                                                                             \
                                                                               \
 addToRunTimeSelectionTable                                                    \
 (                                                                             \
     basicThermo,                                                              \
-    Cthermo##Mixture##Transport##Radiation##Type##Thermo                      \
-        ##EqnOfState##Specie,                                                 \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
     fvMesh                                                                    \
 );                                                                            \
                                                                               \
 addToRunTimeSelectionTable                                                    \
 (                                                                             \
     BaseThermo,                                                               \
-    Cthermo##Mixture##Transport##Radiation##Type##Thermo                      \
-        ##EqnOfState##Specie,                                                 \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
     fvMesh                                                                    \
 );                                                                            \
                                                                               \
 addToRunTimeSelectionTable                                                    \
 (                                                                             \
     BaseThermo,                                                               \
-    Cthermo##Mixture##Transport##Radiation##Type##Thermo                      \
-        ##EqnOfState##Specie,                                                 \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
     dictionary                                                                \
 );
 
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
index bc30f74370..a7fbf5c067 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
@@ -127,49 +127,20 @@ public:
             //- Thermal conductivity [W/m/K]
             virtual tmp<volVectorField> Kappa() const = 0;
 
-            //- Absorption coefficient [1/m]
-            virtual tmp<volScalarField> kappaRad() const = 0;
-
-            //- Scatter coefficient
-            virtual tmp<volScalarField> sigmaS() const = 0;
-
-            //- Emissivity coefficient [1/m]
-            virtual tmp<volScalarField> emissivity() const = 0;
-
 
         // Per patch calculation
 
-
             //- Anisotropic thermal conductivity [W/m/K]
             virtual tmp<vectorField> Kappa
             (
                 const label patchI
             ) const = 0;
 
-             //- Absorption coefficient [1/m]
-            virtual tmp<scalarField> kappaRad
-            (
-                const label patchI
-            ) const = 0;
-
-            //- Scatter coefficient
-            virtual tmp<scalarField> sigmaS
-            (
-                const label patchI
-            ) const = 0;
-
-            //- Emissivity coefficient [1/m]
-            virtual tmp<scalarField> emissivity
-            (
-                const label patchI
-            ) const = 0;
-
 
     // I-O
 
         //- Read thermophysicalProperties dictionary
         virtual bool read();
-
 };
 
 
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C
index 28871b9f75..798bb04cad 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C
@@ -32,48 +32,20 @@ Foam::autoPtr<Foam::solidThermo> Foam::solidThermo::New
     const fvMesh& mesh
 )
 {
-    if (debug)
-    {
-        Info<< "solidThermo::New(const fvMesh&): "
-            << "constructing solidThermo"
-            << endl;
-    }
-
-    const word thermoType
-    (
-        IOdictionary
-        (
-            IOobject
-            (
-                "thermophysicalProperties",
-                mesh.time().constant(),
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        ).lookup("thermoType")
-    );
-
-    fvMeshConstructorTable::iterator cstrIter =
-        fvMeshConstructorTablePtr_->find(thermoType);
-
-    if (cstrIter == fvMeshConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "solidThermo::New(const fvMesh&)"
-        )   << "Unknown solidThermo type " << thermoType
-            << endl << endl
-            << "Valid solidThermo types are :" << endl
-            << fvMeshConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<solidThermo>(cstrIter()(mesh));
+    return basicThermo::New<solidThermo>(mesh);
 }
 
 
+Foam::autoPtr<Foam::solidThermo> Foam::solidThermo::New
+(
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+{
+    return basicThermo::New<solidThermo>(mesh, dict);
+}
+
+/*
 Foam::autoPtr<Foam::solidThermo> Foam::solidThermo::New
 (
     const fvMesh& mesh,
@@ -106,6 +78,7 @@ Foam::autoPtr<Foam::solidThermo> Foam::solidThermo::New
 
     return autoPtr<solidThermo>(cstrIter()(mesh, dict));
 }
+*/
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C
similarity index 88%
rename from src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C
rename to src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C
index 860626e7c7..5c7408eaa4 100644
--- a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C
@@ -23,8 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-
 #include "makeSolidThermo.H"
+#include "solidThermo.H"
+#include "heSolidThermo.H"
 
 #include "specie.H"
 #include "rhoConst.H"
@@ -33,7 +34,6 @@ License
 #include "constIsoSolidTransport.H"
 #include "constAnIsoSolidTransport.H"
 #include "exponentialSolidTransport.H"
-#include "constSolidRad.H"
 #include "pureSolidMixture.H"
 #include "multiComponentSolidMixture.H"
 #include "reactingSolidMixture.H"
@@ -41,11 +41,6 @@ License
 #include "sensibleInternalEnergy.H"
 #include "thermo.H"
 
-#include "heThermo.H"
-
-#include "solidThermo.H"
-#include "solidReactionThermo.H"
-#include "heSolidThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -60,7 +55,6 @@ makeSolidThermo
     heSolidThermo,
     pureSolidMixture,
     constIsoSolidTransport,
-    constSolidRad,
     sensibleEnthalpy,
     hConstThermo,
     rhoConst,
@@ -73,7 +67,6 @@ makeSolidThermo
     heSolidThermo,
     pureSolidMixture,
     constAnIsoSolidTransport,
-    constSolidRad,
     sensibleEnthalpy,
     hConstThermo,
     rhoConst,
@@ -86,7 +79,6 @@ makeSolidThermo
     heSolidThermo,
     pureSolidMixture,
     exponentialSolidTransport,
-    constSolidRad,
     sensibleEnthalpy,
     hExponentialThermo,
     rhoConst,
@@ -99,20 +91,6 @@ makeSolidThermo
     heSolidThermo,
     multiComponentSolidMixture,
     constIsoSolidTransport,
-    constSolidRad,
-    sensibleEnthalpy,
-    hConstThermo,
-    rhoConst,
-    specie
-);
-
-makeSolidThermo
-(
-    solidReactionThermo,
-    heSolidThermo,
-    reactingSolidMixture,
-    constIsoSolidTransport,
-    constSolidRad,
     sensibleEnthalpy,
     hConstThermo,
     rhoConst,
diff --git a/src/thermophysicalModels/specie/Make/files b/src/thermophysicalModels/specie/Make/files
index 739c9f91fd..adb0310042 100644
--- a/src/thermophysicalModels/specie/Make/files
+++ b/src/thermophysicalModels/specie/Make/files
@@ -1,11 +1,6 @@
-atomicWeights = atomicWeights
-specie = specie
-equationOfState = equationOfState
-reactions = reaction/reactions
-
-$(atomicWeights)/atomicWeights.C
-$(specie)/specie.C
-$(reactions)/makeReactionThermoReactions.C
-$(reactions)/makeLangmuirHinshelwoodReactions.C
+atomicWeights/atomicWeights.C
+specie/specie.C
+reaction/reactions/makeReactions.C
+reaction/reactions/makeLangmuirHinshelwoodReactions.C
 
 LIB = $(FOAM_LIBBIN)/libspecie
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C
similarity index 100%
rename from src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
rename to src/thermophysicalModels/specie/reaction/reactions/makeReactions.C
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
index 301c1d7986..f2bfd9fb9b 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            heheuReactionThermo;
+    type            heheuPsiThermo;
     mixture         inhomogeneousMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
index 9c8539a6ab..83a5890120 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            heheuReactionThermo;
+    type            heheuPsiThermo;
     mixture         homogeneousMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
index d6cb3dd45f..c979a11fd0 100644
--- a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
index d6cb3dd45f..c979a11fd0 100644
--- a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
index d6cb3dd45f..c979a11fd0 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
index d6cb3dd45f..c979a11fd0 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
index 4946ebff2a..12d72f931e 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            heheuReactionThermo;
+    type            heheuPsiThermo;
     mixture         inhomogeneousMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
index 57e0ddc7b1..043db29f3a 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<reactingSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         reactingSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 solidComponents
 (
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
index 446c37a397..e75fc0cc63 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         singleStepReactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
index 4610e63a5a..5e88ec565c 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         singleStepReactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
index 4610e63a5a..5e88ec565c 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         singleStepReactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
index 4eca14a981..ae01272133 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
index 0659d6b690..e23ffe9bfe 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
@@ -110,7 +110,16 @@ dictionaryReplacement
 
 
                 // Solid thermo
-                thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+                thermoType
+                {
+                    type            heSolidThermo;
+                    mixture         pureSolidMixture;
+                    transport       constIso;
+                    thermo          hConst;
+                    equationOfState rhoConst;
+                    specie          specie;
+                    energy          sensibleEnthalpy;
+                }
 
 
                 mixture
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index 884f3f652c..e0ffc47007 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
index 884f3f652c..e0ffc47007 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
index 884f3f652c..e0ffc47007 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
index d4f02fb677..fa55ef00d4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties
index d4f02fb677..fa55ef00d4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties
index d4f02fb677..fa55ef00d4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
index d4f02fb677..fa55ef00d4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
index d4f02fb677..fa55ef00d4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
index d4f02fb677..fa55ef00d4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index d4f02fb677..fa55ef00d4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
index d4f02fb677..fa55ef00d4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
index d4f02fb677..fa55ef00d4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
index 99794189d6..0d206ea7f5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
@@ -1,4 +1,4 @@
-/*--------------------------------*- C++ -*----------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
index 99794189d6..e9a94009e5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
index 99794189d6..e9a94009e5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureSolidMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 mixture
 {
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties
index bd526695b9..8b36a40f5d 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            heRhoReactionThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       polynomial;
     thermo          hPolynomial;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 4f5a6b1347..9b63bc18b3 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            heRhoReactionThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       polynomial;
     thermo          hPolynomial;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index 99a7d5707c..9fc96ae257 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
index 380bc6551b..0a37bdeb40 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
index 380bc6551b..0a37bdeb40 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
index 380bc6551b..0a37bdeb40 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
index 380bc6551b..0a37bdeb40 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
index 594121c7ff..a703f9908a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            heRhoReactionThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       polynomial;
     thermo          hPolynomial;
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
index 07b94deeb7..8e324f5244 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            heRhoReactionThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       polynomial;
     thermo          hPolynomial;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 6eb02e10a9..d12affc2f3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            heRhoReactionThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       polynomial;
     thermo          hPolynomial;
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
index 2684e0053e..b0ac29548b 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiReactionThermo;
+    type            hePsiThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;

From 865f2448e54040d8dfcd2daeab8c31a4cc444441 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 4 Oct 2012 10:17:09 +0100
Subject: [PATCH 14/14] Corrected line lengths

---
 .../basic/psiThermo/hePsiThermo.C                     |  6 ++++--
 .../reactionThermo/makeReactionThermo.H               |  3 ++-
 .../psiuReactionThermo/heheuPsiThermo.C               | 11 ++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
index 568191fd56..06c9b47697 100644
--- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
@@ -127,7 +127,8 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::correct()
 {
     if (debug)
     {
-        Info<< "entering hePsiThermo<BasicPsiThermo, MixtureType>::correct()" << endl;
+        Info<< "entering hePsiThermo<BasicPsiThermo, MixtureType>::correct()"
+            << endl;
     }
 
     // force the saving of the old-time values
@@ -137,7 +138,8 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::correct()
 
     if (debug)
     {
-        Info<< "exiting hePsiThermo<BasicPsiThermo, MixtureType>::correct()" << endl;
+        Info<< "exiting hePsiThermo<BasicPsiThermo, MixtureType>::correct()"
+            << endl;
     }
 }
 
diff --git a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
index eb539a02ae..d662b4518f 100644
--- a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
@@ -34,7 +34,8 @@ License
 #define makeReactionMixtureThermo(BaseThermo,CThermo,MixtureThermo,Mixture,ThermoPhys)   \
                                                                                \
 typedef MixtureThermo                                                          \
-<   CThermo,                                                                           \
+<                                                                              \
+    CThermo,                                                                   \
     SpecieMixture                                                              \
     <                                                                          \
         Mixture                                                                \
diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
index 6c7abc3150..8a2daccfe6 100644
--- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
@@ -119,7 +119,10 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::calculate()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class BasicPsiThermo, class MixtureType>
-Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::heheuPsiThermo(const fvMesh& mesh)
+Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::heheuPsiThermo
+(
+    const fvMesh& mesh
+)
 :
     heThermo<psiuReactionThermo, MixtureType>(mesh),
     Tu_
@@ -200,7 +203,8 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()
 {
     if (debug)
     {
-        Info<< "entering heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()" << endl;
+        Info<< "entering heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()"
+            << endl;
     }
 
     // force the saving of the old-time values
@@ -210,7 +214,8 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()
 
     if (debug)
     {
-        Info<< "exiting heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()" << endl;
+        Info<< "exiting heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()"
+            << endl;
     }
 }