diff --git a/applications/solvers/combustion/PDRFoam/EaEqn.H b/applications/solvers/combustion/PDRFoam/EaEqn.H
index 03d13f2693..1baaa7180f 100644
--- a/applications/solvers/combustion/PDRFoam/EaEqn.H
+++ b/applications/solvers/combustion/PDRFoam/EaEqn.H
@@ -7,7 +7,12 @@
       + betav*fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             hea.name() == "ea"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                phi/fvc::interpolate(rho),
+                p,
+                "div(phiv,p)"
+            )
           : -betav*dpdt
         )
       - fvm::laplacian(Db, hea)
diff --git a/applications/solvers/combustion/PDRFoam/EauEqn.H b/applications/solvers/combustion/PDRFoam/EauEqn.H
index 96412cc3c3..f031d90732 100644
--- a/applications/solvers/combustion/PDRFoam/EauEqn.H
+++ b/applications/solvers/combustion/PDRFoam/EauEqn.H
@@ -8,7 +8,12 @@ if (ign.ignited())
       + (betav*fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou()
       + (
             heau.name() == "eau"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))*rho/thermo.rhou()
+          ? fvc::div
+            (
+                phi/fvc::interpolate(rho),
+                p,
+                "div(phiv,p)"
+            )*rho/thermo.rhou()
           : -betav*dpdt*rho/thermo.rhou()
         )
       - fvm::laplacian(Db, heau)
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 79b9fb7756..44c4f6052f 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -116,7 +116,7 @@ void PDRkEpsilon::correct()
     }
 
     tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
+    volScalarField G("RASModel.G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
     tgradU.clear();
 
     // Update espsilon and G at the wall
diff --git a/applications/solvers/combustion/XiFoam/EaEqn.H b/applications/solvers/combustion/XiFoam/EaEqn.H
index a9e72b4627..6840c4eb6d 100644
--- a/applications/solvers/combustion/XiFoam/EaEqn.H
+++ b/applications/solvers/combustion/XiFoam/EaEqn.H
@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             hea.name() == "ea"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), hea)
diff --git a/applications/solvers/combustion/XiFoam/EauEqn.H b/applications/solvers/combustion/XiFoam/EauEqn.H
index 0d81bd6e60..b13a63bb60 100644
--- a/applications/solvers/combustion/XiFoam/EauEqn.H
+++ b/applications/solvers/combustion/XiFoam/EauEqn.H
@@ -8,7 +8,12 @@ if (ign.ignited())
       + (fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou()
       + (
             heau.name() == "eau"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))*rho/thermo.rhou()
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )*rho/thermo.rhou()
           : -dpdt*rho/thermo.rhou()
         )
       - fvm::laplacian(turbulence->alphaEff(), heau)
diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H
index d66cdd8130..7b005cc311 100644
--- a/applications/solvers/combustion/engineFoam/pEqn.H
+++ b/applications/solvers/combustion/engineFoam/pEqn.H
@@ -66,5 +66,5 @@ K = 0.5*magSqr(U);
 
 if (thermo.dpdt())
 {
-    dpdt = fvc::ddt(p);
+    dpdt = fvc::ddt(p) - fvc::div(fvc::meshPhi(rho, U), p);
 }
diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H
index 340cfc63b1..f979d3bb7d 100644
--- a/applications/solvers/combustion/fireFoam/YEEqn.H
+++ b/applications/solvers/combustion/fireFoam/YEEqn.H
@@ -55,7 +55,12 @@ tmp<fv::convectionScheme<scalar> > mvConvection
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
diff --git a/applications/solvers/combustion/reactingFoam/EEqn.H b/applications/solvers/combustion/reactingFoam/EEqn.H
index 33dbc46287..e1bf055604 100644
--- a/applications/solvers/combustion/reactingFoam/EEqn.H
+++ b/applications/solvers/combustion/reactingFoam/EEqn.H
@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwmake b/applications/solvers/compressible/rhoCentralFoam/Allwmake
index 671c640231..33e08e1076 100755
--- a/applications/solvers/compressible/rhoCentralFoam/Allwmake
+++ b/applications/solvers/compressible/rhoCentralFoam/Allwmake
@@ -2,8 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso BCs
-wmake
-wmake rhoCentralDyMFoam
+(wmake libso BCs && wmake && wmake rhoCentralDyMFoam)
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index c65d8618f1..875e42683e 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.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
@@ -195,10 +195,8 @@ void maxwellSlipUFvPatchVectorField::write(Ostream& os) const
         << thermalCreep_ << token::END_STATEMENT << nl;
     os.writeKeyword("curvature") << curvature_ << token::END_STATEMENT << nl;
 
-    os.writeKeyword("refValue")
-        << refValue() << token::END_STATEMENT << nl;
-    os.writeKeyword("valueFraction")
-        << valueFraction() << token::END_STATEMENT << nl;
+    refValue().writeEntry("refValue", os);
+    valueFraction().writeEntry("valueFraction", os);
 
     writeEntry("value", os);
 }
diff --git a/applications/solvers/compressible/rhoPimpleFoam/EEqn.H b/applications/solvers/compressible/rhoPimpleFoam/EEqn.H
index 3ad3c0f03e..6288b8a0af 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/EEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/EEqn.H
@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
diff --git a/applications/solvers/compressible/sonicFoam/EEqn.H b/applications/solvers/compressible/sonicFoam/EEqn.H
index 15979381a9..f10474c587 100644
--- a/applications/solvers/compressible/sonicFoam/EEqn.H
+++ b/applications/solvers/compressible/sonicFoam/EEqn.H
@@ -2,7 +2,8 @@
     solve
     (
         fvm::ddt(rho, e) + fvm::div(phi, e)
-      + fvc::ddt(rho, K) + fvc::div(phi, volScalarField("Ekp", K + p/rho))
+      + fvc::ddt(rho, K) + fvc::div(phi, K)
+      + fvc::div(fvc::absolute(phi/fvc::interpolate(rho), U), p, "div(phiv,p)")
       - fvm::laplacian(turbulence->alphaEff(), e)
     );
 
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/EEqn.H b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/EEqn.H
deleted file mode 100644
index 994c2862b8..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/EEqn.H
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    solve
-    (
-        fvm::ddt(rho, e) + fvm::div(phi, e)
-      + fvc::ddt(rho, K) + fvc::div(phi, K)
-      + fvc::div(phi/fvc::interpolate(rho) + mesh.phi(), p, "div(phiv,p)")
-      - fvm::laplacian(turbulence->alphaEff(), e)
-    );
-
-    thermo.correct();
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H
index dbdc018950..b435b88d7f 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H
@@ -1,5 +1,6 @@
     // Initialise solid field pointer lists
     PtrList<solidThermo> thermos(solidRegions.size());
+    PtrList<radiation::radiationModel> radiations(solidRegions.size());
 
     // Populate solid field pointer lists
     forAll(solidRegions, i)
@@ -13,4 +14,7 @@
             i,
             solidThermo::New(solidRegions[i])
         );
+
+        Info<< "    Adding to radiations\n" << endl;
+        radiations.set(i, radiation::radiationModel::New(thermos[i].T()));
     }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
index e8e21cd63b..78c937d29e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
@@ -1,5 +1,6 @@
     fvMesh& mesh = solidRegions[i];
     solidThermo& thermo = thermos[i];
+    const radiation::radiationModel& radiation = radiations[i];
 
     tmp<volScalarField> trho = thermo.rho();
     const volScalarField& rho = trho();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H
index c5680e7777..9f41c9eb37 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H
@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turb.alphaEff(), he)
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index cbeaf37fce..2a543a4d6f 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -1,5 +1,6 @@
     // Initialise solid field pointer lists
     PtrList<solidThermo> thermos(solidRegions.size());
+    PtrList<radiation::radiationModel> radiations(solidRegions.size());
 
     // Populate solid field pointer lists
     forAll(solidRegions, i)
@@ -9,4 +10,7 @@
 
         Info<< "    Adding to thermos\n" << endl;
         thermos.set(i, solidThermo::New(solidRegions[i]));
+
+        Info<< "    Adding to radiations\n" << endl;
+        radiations.set(i, radiation::radiationModel::New(thermos[i].T()));
     }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
index 0968002e55..788383e5ec 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
@@ -1,5 +1,6 @@
     fvMesh& mesh = solidRegions[i];
     solidThermo& thermo = thermos[i];
+    const radiation::radiationModel& radiation = radiations[i];
 
     tmp<volScalarField> trho = thermo.rho();
     const volScalarField& rho = trho();
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H
index 006d2231f4..92219b9879 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H
@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H
index cdc475d42f..f5a909a9dd 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H
@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H
index 14996cfdf5..c8ef9bf84e 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H
@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
index 475077d317..0301fba2ea 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
@@ -79,5 +79,5 @@ K = 0.5*magSqr(U);
 
 if (thermo.dpdt())
 {
-    dpdt = fvc::ddt(p);
+    dpdt = fvc::ddt(p) - fvc::div(fvc::meshPhi(rho, U), p);
 }
diff --git a/applications/test/dimensionedType/Test-dimensionedType.C b/applications/test/dimensionedType/Test-dimensionedType.C
index 5c826d256f..ccf56fff6b 100644
--- a/applications/test/dimensionedType/Test-dimensionedType.C
+++ b/applications/test/dimensionedType/Test-dimensionedType.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
@@ -41,6 +41,45 @@ int main(int argc, char *argv[])
 
     Info<< ds*dt << " " << dt*ds << endl;
 
+
+    // dimensionSet
+    {
+        Pout<< "dimensionSet construct from is:"
+            << dimensionSet(IStringStream("[Pa m^2 s^-2]")())
+            << endl;
+
+        IStringStream is("[Pa m^2 s^-2]");
+        dimensionSet dset(dimless);
+        is >> dset;
+        Pout<< "dimensionSet read:" << dset << endl;
+    }
+    // dimensionedType
+    {
+        Pout<< "construct from is:"
+            << dimensionedScalar(IStringStream("bla [Pa mm^2 s^-2] 3.0")())
+            << endl;
+        Pout<< "construct from name,is:"
+            <<  dimensionedScalar
+                (
+                    "ABC",
+                    IStringStream("[Pa mm^2 s^-2] 3.0")()
+                ) << endl;
+        Pout<< "construct from name,dimensionSet,is:"
+            <<  dimensionedScalar
+                (
+                    "ABC",
+                    dimLength,
+                    IStringStream("bla [mm] 3.0")()
+                ) << endl;
+        {
+            IStringStream is("bla [mm] 3.0");
+            dimensionedScalar ds;
+            is >> ds;
+            Pout<< "read:" << ds << endl;
+        }
+    }
+
+
     Info<< "End\n" << endl;
 
     return 0;
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index ef479dbbbb..b3be8fe96f 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -310,6 +310,10 @@ addLayersControls
     //  make straight angle.
     featureAngle 60;
 
+    //- At non-patched sides allow mesh to slip if extrusion direction makes
+    //  angle larger than slipFeatureAngle.
+    slipFeatureAngle 30;
+
     //- Maximum number of snapping relaxation iterations. Should stop
     //  before upon reaching a correct mesh.
     nRelaxIter 5;
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.
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;
 
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index d129efde6d..4abdc6c607 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -55,6 +55,8 @@ Description
     this if you don't mind having disconnected domains in a single region.
     This option requires all cells to be in one (and one only) cellZone.
 
+    - prefixRegion prefixes all normal patches with region name (interface
+    (patches already have region name prefix)
 
     - Should work in parallel.
     cellZones can differ on either side of processor boundaries in which case
@@ -389,6 +391,40 @@ void reorderPatches
 }
 
 
+// Prepend prefix to selected patches.
+void renamePatches
+(
+    fvMesh& mesh,
+    const word& prefix,
+    const labelList& patchesToRename
+)
+{
+    polyBoundaryMesh& polyPatches =
+        const_cast<polyBoundaryMesh&>(mesh.boundaryMesh());
+    forAll(patchesToRename, i)
+    {
+        label patchI = patchesToRename[i];
+        polyPatch& pp = polyPatches[patchI];
+
+        if (isA<coupledPolyPatch>(pp))
+        {
+            WarningIn
+            (
+                "renamePatches(fvMesh&, const word&, const labelList&"
+            )   << "Encountered coupled patch " << pp.name()
+                << ". Will only rename the patch itself,"
+                << " not any referred patches."
+                << " This might have to be done by hand."
+                << endl;
+        }
+
+        pp.name() = prefix + '_' + pp.name();
+    }
+    // Recalculate any demand driven data (e.g. group to name lookup)
+    polyPatches.updateMesh();
+}
+
+
 template<class GeoField>
 void subsetVolFields
 (
@@ -987,6 +1023,7 @@ void createAndWriteRegion
     const fvMesh& mesh,
     const labelList& cellRegion,
     const wordList& regionNames,
+    const bool prefixRegion,
     const labelList& faceToInterface,
     const labelList& interfacePatches,
     const label regionI,
@@ -1017,6 +1054,7 @@ void createAndWriteRegion
         addedPatches.insert(interfacePatches[interfaceI]+1);
     }
 
+
     Info<< "Mapping fields" << endl;
 
     // Map existing fields
@@ -1109,6 +1147,7 @@ void createAndWriteRegion
 
     // Create reordering list to move patches-to-be-deleted to end
     labelList oldToNew(newPatches.size(), -1);
+    DynamicList<label> sharedPatches(newPatches.size());
     label newI = 0;
 
     Info<< "Deleting empty patches" << endl;
@@ -1122,7 +1161,12 @@ void createAndWriteRegion
         {
             if (returnReduce(pp.size(), sumOp<label>()) > 0)
             {
-                oldToNew[patchI] = newI++;
+                oldToNew[patchI] = newI;
+                if (!addedPatches.found(patchI))
+                {
+                    sharedPatches.append(newI);
+                }
+                newI++;
             }
         }
     }
@@ -1152,6 +1196,15 @@ void createAndWriteRegion
     reorderPatches(newMesh(), oldToNew, nNewPatches);
 
 
+    // Rename shared patches with region name
+    if (prefixRegion)
+    {
+        Info<< "Prefixing patches with region name" << endl;
+
+        renamePatches(newMesh(), regionNames[regionI], sharedPatches);
+    }
+
+
     Info<< "Writing new mesh" << endl;
 
     newMesh().setInstance(newMeshInstance);
@@ -1672,6 +1725,11 @@ int main(int argc, char *argv[])
         "useFaceZones",
         "use faceZones to patch inter-region faces instead of single patch"
     );
+    argList::addBoolOption
+    (
+        "prefixRegion",
+        "prefix region name to all patches, not just coupling patches"
+    );
 
     #include "setRootCase.H"
     #include "createTime.H"
@@ -1696,6 +1754,8 @@ int main(int argc, char *argv[])
     const bool detectOnly       = args.optionFound("detectOnly");
     const bool sloppyCellZones  = args.optionFound("sloppyCellZones");
     const bool useFaceZones     = args.optionFound("useFaceZones");
+    const bool prefixRegion     = args.optionFound("prefixRegion");
+
 
     if
     (
@@ -2226,6 +2286,7 @@ int main(int argc, char *argv[])
                 mesh,
                 cellRegion,
                 regionNames,
+                prefixRegion,
                 faceToInterface,
                 interfacePatches,
                 regionI,
@@ -2246,6 +2307,7 @@ int main(int argc, char *argv[])
                 mesh,
                 cellRegion,
                 regionNames,
+                prefixRegion,
                 faceToInterface,
                 interfacePatches,
                 regionI,
@@ -2266,6 +2328,7 @@ int main(int argc, char *argv[])
                     mesh,
                     cellRegion,
                     regionNames,
+                    prefixRegion,
                     faceToInterface,
                     interfacePatches,
                     regionI,
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index 43615129c9..6fe40ed9f1 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -56,7 +56,6 @@ EXE_LIBS = \
     -lsolidMixtureProperties \
     -lsolidParticle \
     -lsolidProperties \
-    -lsolid \
     -lspecie \
     -lsurfaceFilmModels \
     -lsurfMesh \
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
index 38f94e13c7..444af26ce0 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
@@ -13,6 +13,5 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lgenericPatchFields \
     -lspecie \
-    -lsolid \
     -lfluidThermophysicalModels \
     -lsolidThermo
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 69cee38a01..13c5841c3a 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
         }
 
         // Create G field - used by RAS wall functions
-        volScalarField G("RASModel::G", nut*2*sqr(S));
+        volScalarField G("RASModel.G", nut*2*sqr(S));
 
 
         //--- Read and modify turbulence fields
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 3a9d667650..d06e5d03cb 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -721,16 +721,34 @@ int main(int argc, char *argv[])
                 deleteBox(surf, bb, true, edgeStat);
             }
 
-            const Switch manifoldEdges =
-                subsetDict.lookupOrDefault<Switch>("manifoldEdges", "no");
+            const Switch nonManifoldEdges =
+                subsetDict.lookupOrDefault<Switch>("nonManifoldEdges", "yes");
 
-            if (manifoldEdges)
+            if (!nonManifoldEdges)
             {
-                Info<< "Removing all non-manifold edges" << endl;
+                Info<< "Removing all non-manifold edges"
+                    << " (edges with > 2 connected faces)" << endl;
 
                 forAll(edgeStat, edgeI)
                 {
-                    if (surf.edgeFaces()[edgeI].size() != 2)
+                    if (surf.edgeFaces()[edgeI].size() > 2)
+                    {
+                        edgeStat[edgeI] = surfaceFeatures::NONE;
+                    }
+                }
+            }
+
+            const Switch openEdges =
+                subsetDict.lookupOrDefault<Switch>("openEdges", "yes");
+
+            if (!openEdges)
+            {
+                Info<< "Removing all open edges"
+                    << " (edges with 1 connected face)" << endl;
+
+                forAll(edgeStat, edgeI)
+                {
+                    if (surf.edgeFaces()[edgeI].size() == 1)
                     {
                         edgeStat[edgeI] = surfaceFeatures::NONE;
                     }
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
index 934d5869a9..6c1eab66e9 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
@@ -59,15 +59,21 @@ surface2.nas
     {
         // Use a plane to select feature edges
         // (normal)(basePoint)
+        // Keep only edges that intersect the plane will be included
         plane               (1 0 0)(0 0 0);
 
         // Select feature edges using a box
         // (minPt)(maxPt)
+        // Keep edges inside the box:
         insideBox           (0 0 0)(1 1 1);
+        // Keep edges outside the box:
         outsideBox          (0 0 0)(1 1 1);
 
-        // Remove any non-manifold (open or > 2 connected faces) edges
-        manifoldEdges       no;
+        // Keep nonManifold edges (edges with >2 connected faces)
+        nonManifoldEdges       yes;
+
+        // Keep open edges (edges with 1 connected face)
+        openEdges       yes;
     }
 
     addFeatures
diff --git a/doc/tools/find-junkFiles b/doc/tools/find-junkFiles
deleted file mode 100755
index 5b98d35195..0000000000
--- a/doc/tools/find-junkFiles
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Find ();
-
-# -----------------------------------------------------------------------------
-#
-# Script
-#     find-junkFiles
-#
-# Description
-#     Search for "junk" files left over from editor, core, CVS, etc. 
-#
-#     - print filename only
-#
-# -----------------------------------------------------------------------------
-
-sub wanted {
-    return unless -f $_;
-        
-    if (
-        m{^\.?.+~$} ## editor backup
-        or m{^\#.+\#$}  ## editor autosave
-        or m{^\.\#.+$}  ## cvs replace update (eg, ".#test.c.1.3")
-        or m{^core(\.\d+)?$} ## core dump        
-    ) {
-        print "$File::Find::name\n";
-    }
-}
-
-
-## Traverse desired filesystems
-for my $dir (@ARGV) {
-    no warnings 'File::Find';
-    warn "(**) checking '$dir' ...\n";
-    File::Find::find( { wanted => \&wanted }, $dir );
-}
-
diff --git a/doc/tools/find-longlines b/doc/tools/find-longlines
deleted file mode 100755
index 424cd91cd2..0000000000
--- a/doc/tools/find-longlines
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Find ();
-
-# -----------------------------------------------------------------------------
-#
-# Script
-#     find-longlines
-#
-# Description
-#     Search for *.[CH] files that exceed the 80-column width
-#
-#     - print filename lineNumber and offending line (with truncation point)
-#
-# -----------------------------------------------------------------------------
-
-my $maxlen = 80;
-my $re_filespec = qr{^.+\.[CH]$};
-my $count;
-
-sub wanted {
-    unless ( lstat($_) and -f _ and -r _ and not -l _ and /$re_filespec/ ) {
-        return;
-    }
-
-    local @ARGV = $_;
-    while (<>) {
-        chomp;
-        s{\s+$}{};        # trim
-
-        if ( $maxlen < length ) {
-            $count++;
-            substr( $_, $maxlen, 0 ) = "||->>";    # show truncation point
-            print "$File::Find::name  $. $_\n";
-        }
-    }
-    close ARGV;
-}
-
-## Traverse desired filesystems
-for my $dir (@ARGV) {
-    no warnings 'File::Find';
-    warn "(**) checking '$dir' ...\n";
-    File::Find::find( { wanted => \&wanted }, $dir );
-}
-
diff --git a/doc/tools/find-placeholderDescription b/doc/tools/find-placeholderDescription
deleted file mode 100755
index d22fe5f72f..0000000000
--- a/doc/tools/find-placeholderDescription
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Find ();
-
-# -----------------------------------------------------------------------------
-#
-# Script
-#     find-placeholderDescription
-#
-# Description
-#     Search for *.[H] files with a Description that looks like it is
-#     a placeholder
-#     eg, Foam::className
-#
-#     - print filename '#' and the description
-#
-# -----------------------------------------------------------------------------
-
-my $minLength   = 16;
-my $re_filespec = qr{^.+\.[H]$};
-
-# for the convenience of &wanted calls, including -eval statements:
-## use vars qw( *name *dir *prune );
-## *name   = *File::Find::name;
-## *dir    = *File::Find::dir;
-## *prune  = *File::Find::prune;
-
-sub wanted {
-    unless ( lstat($_) and -f _ and -r _ and not -l _ and /$re_filespec/ ) {
-        return;
-    }
-
-    my ( $tag, $description );
-
-    local @ARGV = $_;
-    while (<>) {
-        my $name;
-
-        ## examine the class/typedef name
-        if (/^(Class|Typedef)\s*$/) {
-            $_ = <>;
-            ($tag) = split;
-        }
-        if (/^Description\s*$/) {
-            $_ = <>;
-            ( $description = $_ ) =~ s{^\s+|\s+$}{}g;
-
-            # remove trailing punctuation as being noise
-            $description =~ s{\s*[.,:]+$}{};
-            last;
-        }
-    }
-
-    $description ||= '';
-
-    ## we have 'Class/Typedef' tag
-    if ( defined $tag ) {
-        # description looks like a class name
-        if (
-            $description =~ m{^\w+(::\w+)+$}
-        ) {
-            print "$File::Find::name   # $description\n";
-        }
-    }
-}
-
-## Traverse desired filesystems
-for my $dir (@ARGV) {
-    no warnings 'File::Find';
-    warn "(**) checking '$dir' ...\n";
-    File::Find::find( { wanted => \&wanted }, $dir );
-}
-
diff --git a/doc/tools/find-retagged b/doc/tools/find-retagged
deleted file mode 100755
index bde54a1b9d..0000000000
--- a/doc/tools/find-retagged
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Find ();
-
-# -----------------------------------------------------------------------------
-#
-# Script
-#     find-retagged
-#
-# Description
-#     Search for *.[H] files with 'InClass', 'InNamespace' or 'Type'
-#     starting in the first column.
-#     In some places these could removed. In other places they should be
-#     replaced with a 'Typedef'
-#     - print filename and the tag (InClass|InNamespace|Type)
-#
-# -----------------------------------------------------------------------------
-
-my $re_filespec = qr{^.+\.[H]$};
-
-# for the convenience of &wanted calls, including -eval statements:
-## use vars qw( *name *dir *prune );
-## *name   = *File::Find::name;
-## *dir    = *File::Find::dir;
-## *prune  = *File::Find::prune;
-
-sub wanted {
-    unless ( lstat($_) and -f _ and -r _ and not -l _ and /$re_filespec/ ) {
-        return;
-    }
-
-    local @ARGV = $_;
-    while (<>) {
-        if (/^(InClass|InNamespace|Type)\s*$/) {
-            print "$File::Find::name  $1  line=$.\n";
-        }
-    }
-
-    close ARGV;
-}
-
-## Traverse desired filesystems
-for my $dir (@ARGV) {
-    no warnings 'File::Find';
-    warn "(**) checking '$dir' ...\n";
-    File::Find::find( { wanted => \&wanted }, $dir );
-}
-
diff --git a/doc/tools/find-suspiciousTags b/doc/tools/find-suspiciousTags
deleted file mode 100755
index e28550df45..0000000000
--- a/doc/tools/find-suspiciousTags
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Find ();
-
-# -----------------------------------------------------------------------------
-#
-# Script
-#     find-suspiciousTags
-#
-# Description
-#     Search for *.[CH] files with 'Class' or 'Namespace' starting in the
-#     first column but without a class being defined anywhere in the file.
-#     These are probably incorrect or should be at least be
-#     changed to 'In Class' / 'In Namespace' for now.
-#     - print filename and 'InClass' or 'InNamespace'
-#
-#     Find the namespaces used in the files and compare these to what is
-#     given on the 'Class' information
-#     - print filename and corrected Class
-#
-#     Check for trailing garbage in the 'Class' information
-#     - print filename and 'ClassWithTrailingInformation'
-#
-# -----------------------------------------------------------------------------
-
-my $re_filespec = qr{^.+\.[CH]$};
-
-# for the convenience of &wanted calls, including -eval statements:
-## use vars qw( *name *dir *prune );
-## *name   = *File::Find::name;
-## *dir    = *File::Find::dir;
-## *prune  = *File::Find::prune;
-
-sub wanted {
-    unless ( lstat($_) and -f _ and -r _ and not -l _ and /$re_filespec/ ) {
-        return;
-    }
-
-    # potential className
-    ( my $fileClass = $_ ) =~ s{\.[A-Za-z]$}{};
-
-    my ( $namespace, $currentClass, %classes, %found ) = ('');
-
-    local @ARGV = $_;
-    while (<>) {
-        my $name;
-
-        ## look for (class|namespace), deal with repeats
-        if ( ($name) = /^\s*class\s+(\w+)\s*/ ) {
-            $classes{$name}++;
-        }
-        elsif ( ($name) = /^\s*namespace\s+(\w+)\s*/ ) {
-            ## reset if 'Foam' namespace appears again
-            $namespace = '' if $name eq "Foam";
-            $namespace .= $name . "::";
-        }
-        elsif (/^(Class|Namespace)\s*/) {
-            $found{$1}++;
-
-            ## examine the class name
-            if (/^Class\s*$/) {
-                $_ = <>;
-                my @trailing;
-                ( $currentClass, @trailing ) = split;
-                if (@trailing) {
-                    $found{-trailing}++;
-                }
-                
-                # the next line should be blank
-                $_ = <>;
-                $_ ||= '';
-                
-                if (not /^\s*$/) {
-                    $found{-spacing}++;
-                }
-            }
-        }
-    }
-
-    # always report if the Class has trailing information
-    if ( delete $found{-trailing} ) {
-        print "$File::Find::name ClassWithTrailingInformation\n";
-    }
-
-    # always report if the Class has spacing problem
-    if ( delete $found{-spacing} ) {
-        print "$File::Find::name ClassWithSpacingIssue\n";
-    }
-
-    if (%classes) {
-        ## we have 'Class' tag
-        if ( defined $currentClass ) {
-            if ($namespace) {
-                my ($currentNamespace) = $currentClass =~ m{^(.+::)};
-                $currentNamespace ||= '';
-
-                if ( $namespace ne $currentNamespace ) {
-                    $currentClass =~ s{^(.+::)}{};
-                    $currentClass ||= $fileClass;
-
-                    print "$File::Find::name $namespace$currentClass\n";
-                }
-            }
-            elsif ( not $currentClass ) {
-                ## supply a class name
-                print "$File::Find::name $fileClass\n";
-            }
-        }
-    }
-    else {
-        ## no classes, all tags are deemed suspicious
-        for ( sort keys %found ) {
-            print "$File::Find::name In$_\n";
-        }
-    }
-}
-
-## Traverse desired filesystems
-for my $dir (@ARGV) {
-    no warnings 'File::Find';
-    warn "(**) checking '$dir' ...\n";
-    File::Find::find( { wanted => \&wanted }, $dir );
-}
-
diff --git a/doc/tools/find-templateInComments b/doc/tools/find-templateInComments
deleted file mode 100755
index 2ad47b936f..0000000000
--- a/doc/tools/find-templateInComments
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Find ();
-
-# -----------------------------------------------------------------------------
-#
-# Script
-#     find-templateInComments
-#
-# Description
-#     Search for *.[CH] files with '<xxx>' tags within the first comment block
-#     These likely need to be quoted as '\<xxx\>' for Doxygen.
-#     - print filename and lineNumber
-#
-# -----------------------------------------------------------------------------
-
-my $re_filespec = qr{^.+\.[CH]$};
-
-# for the convenience of &wanted calls, including -eval statements:
-## use vars qw( *name *dir *prune );
-## *name   = *File::Find::name;
-## *dir    = *File::Find::dir;
-## *prune  = *File::Find::prune;
-
-sub wanted {
-    unless ( lstat($_) and -f _ and -r _ and not -l _ and /$re_filespec/ ) {
-        return;
-    }
-
-    local @ARGV = $_;
-    while (<>) {
-        if (m{^\s*/\*} ... m{\*/})
-        {
-            if (m{\<\s*\w+\s*\>}) {
-                print "$File::Find::name  line=$.\n";
-            }
-            
-            if (m{\*/}) {
-                last;
-            }
-        }
-    }
-
-    close ARGV;
-}
-
-
-## Traverse desired filesystems
-for my $dir (@ARGV) {
-    no warnings 'File::Find';
-    warn "(**) checking '$dir' ...\n";
-    File::Find::find( { wanted => \&wanted }, $dir );
-}
-
diff --git a/doc/tools/find-tinyDescription b/doc/tools/find-tinyDescription
deleted file mode 100755
index 8319fc198a..0000000000
--- a/doc/tools/find-tinyDescription
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Find ();
-
-# -----------------------------------------------------------------------------
-#
-# Script
-#     find-tinyDescription
-#
-# Description
-#     Search for *.[H] files with 'Class' starting in the first column
-#     and a missing Description, or a tiny Description.
-#     A tiny Description is less than XX letters and does not resemble
-#     the class name. We'll look for descriptions matching the class name
-#     in a later pass.
-#
-#     - print filename '#' and the description
-#
-# -----------------------------------------------------------------------------
-
-my $minLength   = 16;
-my $re_filespec = qr{^.+\.[H]$};
-
-# for the convenience of &wanted calls, including -eval statements:
-## use vars qw( *name *dir *prune );
-## *name   = *File::Find::name;
-## *dir    = *File::Find::dir;
-## *prune  = *File::Find::prune;
-
-sub wanted {
-    unless ( lstat($_) and -f _ and -r _ and not -l _ and /$re_filespec/ ) {
-        return;
-    }
-
-    my ( $currentClass, $description );
-
-    local @ARGV = $_;
-    while (<>) {
-        my $name;
-
-        ## examine the class name
-        if (/^Class\s*$/) {
-            $_ = <>;
-            ($currentClass) = split;
-        }
-        if (/^Description\s*$/) {
-            $_ = <>;
-            ( $description = $_ ) =~ s{^\s+|\s+$}{}g;
-            
-            # remove trailing punctuation as being noise
-            $description =~ s{\s*[.,:]+$}{};
-            last;
-        }
-    }
-
-    $description ||= '';
-
-    ## we have 'Class' tag
-    if ( defined $currentClass ) {
-        # description doesnt looks like a class name
-        if (
-            $description !~ m{^\w+(::\w+)+$}
-            and 
-            (length $description < $minLength or $description =~ m{^\S+$})
-        ) {            
-            print "$File::Find::name # $description\n";
-        }
-    }
-}
-
-## Traverse desired filesystems
-for my $dir (@ARGV) {
-    no warnings 'File::Find';
-    warn "(**) checking '$dir' ...\n";
-    File::Find::find( { wanted => \&wanted }, $dir );
-}
-
diff --git a/doc/tools/fix-Class b/doc/tools/fix-Class
deleted file mode 100755
index fbcca6c36f..0000000000
--- a/doc/tools/fix-Class
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-# -----------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-#    \\/     M anipulation  |
-# ------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Script
-#     fix-Class
-#
-# Description
-#     Process the lists given on the command line.
-#     Column 1 = fileName, column 2 = Class or action
-#     See find-suspiciousTags for details.
-#
-#     1. fix ClassWithTrailingInformation by hand
-#     2. InClass and InNamespace fixup
-#     3. change
-#         |Class
-#         |    anything
-#         ->
-#         |Class
-#         |    className
-#
-# -----------------------------------------------------------------------------
-
-# stop if trailing junk has been detected
-for fileList
-do
-   [ -f $fileList -a -r $fileList ] || {
-      echo "cannot read file list: $fileList"
-      exit 1
-   }
-
-   grep ClassWithTrailingInformation $fileList
-   if [ $? = 0 ]
-   then
-      echo "#"
-      echo "# fix ClassWithTrailingInformation by hand"
-      echo "#"
-      exit 99
-   fi
-done
-
-for fileList
-do
-   # repair InClass, InNamespace
-   for tag in Class Namespace
-   do
-      backup=".repair-In$tag"
-      for file in $(sed -n -e "s/In$tag *$//p" $fileList)
-      do
-         echo "repair In$tag: $file"
-         perl -i$backup -pe "s/^$tag/In$tag/" $file
-      done
-   done
-
-   # repair the class names (with namespace)
-   backup=".repair-reclassify"
-   cat $fileList | while read fileName className
-   do
-      # use classes with '::' separator to avoid too
-      # many false positives
-      perl -i$backup -x $0 $fileName $className
-   done
-done
-
-exit 0
-
-# ---------------------------------------------------------------- end-of-file
-# embedded Perl program
-#!/usr/bin/perl -w
-use strict;
-
-# args:  fileName className
-#   - className must contain '::'
-my $className = pop;
-@ARGV == 1 and ($className ||= '') =~ /::/ or exit 1;
-
-warn "repair: @ARGV $className\n";
-
-while (<>)
-{
-    if (/^Class\s*$/) {
-        print;
-        $_ = <>;  # get and discard the next line
-        $_ = "    $className\n";
-    }
-
-    print;
-}
-
-# ---------------------------------------------------------------- end-of-file
diff --git a/etc/controlDict b/etc/controlDict
index c4cf09edb2..d5c1fdb755 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -981,15 +981,29 @@ DimensionSets
         Cd  Cd  [ 0 0 0 0 0 0 1 ] 1.0;
 
         // Derived units
-        Pa  Pa  [ kg^1 m^-2 ] 1.0;
+        Hz  Hz  [ s^-1 ] 1.0;
+        N   N   [ kg m s^-2 ] 1.0;
+        Pa  Pa  [ N m^-2 ] 1.0;
+        J   J   [ N m ] 1.0;
+        W   W   [ J s^-1 ] 1.0;
 
-        // Scaled units
-        mm  mm  [ kg^1 m^-2 ] 1e-3;
+        // Some non-symbolic ones
+        area area [m^2] 1.0;
+        volume volume [m^3] 1.0;
+        density density [ kg m^-3 ] 1.0;
+        acceleration acceleration  [ m s^-2 ] 1.0;
+        kinematicPressure kinematicPressure [ Pa density^-1 ] 1.0;
 
+        // Scaled units. Only allowed in dymensionedType (dimensionedScalar,
+        // dimensionedVector etc.) and UniformDimensionedField, not
+        // in DimensionedField or GeometricField
+        cm  cm  [ m ] 1e-2;
+        mm  mm  [ m ] 1e-3;
+        km  km  [ m ] 1e3;
 
         // Set of units used for printing. Can be any basic or derived
         // but not scaled (only supported for dimensionedScalar, etc)
-        writeUnits (kg m s K mol A Cd);
+        //writeUnits (kg m s K mol A Cd);
     }
 }
 
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/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
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 853c6244d7..00f1beefbe 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -85,8 +85,8 @@ void Foam::Time::readDict()
         {
             if
             (
-                secondaryWriteControl_
-             == wcTimeStep && label(secondaryWriteInterval_) < 1
+                secondaryWriteControl_ == wcTimeStep
+             && label(secondaryWriteInterval_) < 1
             )
             {
                 FatalIOErrorIn("Time::readDict()", controlDict_)
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 40abb17d47..295749ea4c 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -189,7 +189,7 @@ Foam::dictionary::dictionary
     parent_(parentDict)
 {
     transfer(dict());
-    name() = parentDict.name() + "::" + name();
+    name() = parentDict.name() + '.' + name();
 }
 
 
@@ -622,7 +622,7 @@ Foam::dictionary Foam::dictionary::subOrEmptyDict
         }
         else
         {
-            return dictionary(*this, dictionary(name() + "::" + keyword));
+            return dictionary(*this, dictionary(name() + '.' + keyword));
         }
     }
     else
@@ -690,7 +690,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
 
             if (hashedEntries_.insert(entryPtr->keyword(), entryPtr))
             {
-                entryPtr->name() = name() + "::" + entryPtr->keyword();
+                entryPtr->name() = name() + '.' + entryPtr->keyword();
 
                 if (entryPtr->keyword().isPattern())
                 {
@@ -718,7 +718,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
 
     if (hashedEntries_.insert(entryPtr->keyword(), entryPtr))
     {
-        entryPtr->name() = name() + "::" + entryPtr->keyword();
+        entryPtr->name() = name() + '.' + entryPtr->keyword();
         IDLList<entry>::append(entryPtr);
 
         if (entryPtr->keyword().isPattern())
@@ -925,7 +925,7 @@ bool Foam::dictionary::changeKeyword
 
     // change name and HashTable, but leave DL-List untouched
     iter()->keyword() = newKeyword;
-    iter()->name() = name() + "::" + newKeyword;
+    iter()->name() = name() + '.' + newKeyword;
     hashedEntries_.erase(oldKeyword);
     hashedEntries_.insert(newKeyword, iter());
 
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 17901737ca..2eab9e2778 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -117,7 +117,7 @@ public:
         {
             const word scopedName = name_.name();
 
-            string::size_type i = scopedName.rfind(':');
+            string::size_type i = scopedName.rfind('.');
 
             if (i == scopedName.npos)
             {
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index aa1321d914..48e92e5340 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -37,7 +37,7 @@ Foam::dictionary::dictionary
     Istream& is
 )
 :
-    dictionaryName(parentDict.name() + "::" + name),
+    dictionaryName(parentDict.name() + '.' + name),
     parent_(parentDict)
 {
     read(is);
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
index eb8fd09280..bce5e22aa2 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
@@ -27,6 +27,7 @@ License
 #include "dictionary.H"
 #include "IFstream.H"
 #include "addToMemberFunctionSelectionTable.H"
+#include "stringOps.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -68,10 +69,14 @@ namespace functionEntries
 
 Foam::fileName Foam::functionEntries::includeEntry::includeFileName
 (
-    Istream& is
+    Istream& is,
+    const dictionary& dict
 )
 {
     fileName fName(is);
+    // Substitute dictionary entries
+    stringOps::inplaceExpand(fName, dict);
+    // Substitute remaining environment variables
     fName.expand();
 
     if (fName.empty() || fName.isAbsolute())
@@ -94,7 +99,7 @@ bool Foam::functionEntries::includeEntry::execute
     Istream& is
 )
 {
-    const fileName fName(includeFileName(is));
+    const fileName fName(includeFileName(is, parentDict));
     IFstream ifs(fName);
 
     if (ifs)
@@ -129,7 +134,7 @@ bool Foam::functionEntries::includeEntry::execute
     Istream& is
 )
 {
-    const fileName fName(includeFileName(is));
+    const fileName fName(includeFileName(is, parentDict));
     IFstream ifs(fName);
 
     if (ifs)
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
index c1c847a0c3..87b45c4516 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.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
@@ -77,7 +77,7 @@ protected:
     // Protected Member Functions
 
         //- Read the include fileName from Istream, expand and return
-        static fileName includeFileName(Istream&);
+        static fileName includeFileName(Istream&, const dictionary&);
 
 
 public:
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C
index 0807bbd0b8..2c0ccc9893 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.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
@@ -69,7 +69,7 @@ bool Foam::functionEntries::includeIfPresentEntry::execute
     Istream& is
 )
 {
-    const fileName fName(includeFileName(is));
+    const fileName fName(includeFileName(is, parentDict));
     IFstream ifs(fName);
 
     if (ifs)
@@ -92,7 +92,7 @@ bool Foam::functionEntries::includeIfPresentEntry::execute
     Istream& is
 )
 {
-    const fileName fName(includeFileName(is));
+    const fileName fName(includeFileName(is, parentDict));
     IFstream ifs(fName);
 
     if (ifs)
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index c91f3df5aa..1349e66ebf 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@@ -81,7 +81,7 @@ Foam::primitiveEntry::primitiveEntry(const keyType& key, const ITstream& is)
     entry(key),
     ITstream(is)
 {
-    name() += "::" + keyword();
+    name() += '.' + keyword();
 }
 
 
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
index fd442af47a..763981488c 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
@@ -186,7 +186,7 @@ Foam::primitiveEntry::primitiveEntry
     entry(key),
     ITstream
     (
-        is.name() + "::" + key,
+        is.name() + '.' + key,
         tokenList(10),
         is.format(),
         is.version()
@@ -201,7 +201,7 @@ Foam::primitiveEntry::primitiveEntry(const keyType& key, Istream& is)
     entry(key),
     ITstream
     (
-        is.name() + "::" + key,
+        is.name() + '.' + key,
         tokenList(10),
         is.format(),
         is.version()
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&);
 
diff --git a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
index 4576661137..b49ab8ccb9 100644
--- a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.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
@@ -82,7 +82,13 @@ Description
         )                                                                     \
         {                                                                     \
             construct##argNames##ConstructorTables();                         \
-            argNames##ConstructorTablePtr_->insert(lookup, New);              \
+            if (!argNames##ConstructorTablePtr_->insert(lookup, New))         \
+            {                                                                 \
+                std::cerr<< "Duplicate entry " << lookup                      \
+                    << " in runtime selection table " << #baseType            \
+                    << std::endl;                                             \
+                error::safePrintStack(std::cerr);                             \
+            }                                                                 \
         }                                                                     \
                                                                               \
         ~add##argNames##ConstructorToTable()                                  \
@@ -167,11 +173,20 @@ Description
         )                                                                     \
         {                                                                     \
             construct##argNames##ConstructorTables();                         \
-            argNames##ConstructorTablePtr_->insert                            \
+            if                                                                \
             (                                                                 \
-                lookup,                                                       \
-                New##baseType                                                 \
-            );                                                                \
+               !argNames##ConstructorTablePtr_->insert                        \
+                (                                                             \
+                    lookup,                                                   \
+                    New##baseType                                             \
+                )                                                             \
+            )                                                                 \
+            {                                                                 \
+                std::cerr<< "Duplicate entry " << lookup                      \
+                    << " in runtime selection table " << #baseType            \
+                    << std::endl;                                             \
+                error::safePrintStack(std::cerr);                             \
+            }                                                                 \
         }                                                                     \
                                                                               \
         ~add##argNames##ConstructorToTable()                                  \
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.C b/src/OpenFOAM/dimensionSet/dimensionSet.C
index 1b900f52d5..c0da41236e 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.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
@@ -105,83 +105,6 @@ void Foam::dimensionSet::reset(const dimensionSet& ds)
 }
 
 
-Foam::string Foam::dimensionSet::asText() const
-{
-    OStringStream buf;
-
-    bool Dimensionless = true;
-
-    for (int Dimension=0; Dimension < dimensionSet::nDimensions-1; ++Dimension)
-    {
-        const scalar& expt = exponents_[Dimension];
-
-        if (expt < smallExponent && expt > -smallExponent)
-        {
-            continue;
-        }
-
-        if (Dimensionless)
-        {
-            Dimensionless = false;
-        }
-        else
-        {
-            buf << ' ';
-        }
-
-        // note: currently only handle SI
-        switch (Dimension)
-        {
-            case MASS:
-                buf << "kg";
-                break;
-
-            case LENGTH:
-                buf << "m";
-                break;
-
-            case TIME:
-                buf << "s";
-                break;
-
-            case TEMPERATURE:
-                buf << "K";
-                break;
-
-            case MOLES:
-                buf << "mol";
-                break;
-
-            case CURRENT:
-                buf << "A";
-                break;
-
-            case LUMINOUS_INTENSITY:
-                buf << "Cd";
-                break;
-
-            default:
-                buf << "??";  // this shouldn't be - flag as being weird
-                break;
-        }
-
-        if (expt != 1)
-        {
-            buf << '^' << expt;
-        }
-    }
-
-    if (Dimensionless)
-    {
-        return "none";
-    }
-    else
-    {
-        return buf.str();
-    }
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 Foam::scalar Foam::dimensionSet::operator[](const dimensionType type) const
@@ -196,6 +119,18 @@ Foam::scalar& Foam::dimensionSet::operator[](const dimensionType type)
 }
 
 
+Foam::scalar Foam::dimensionSet::operator[](const label type) const
+{
+    return exponents_[type];
+}
+
+
+Foam::scalar& Foam::dimensionSet::operator[](const label type)
+{
+    return exponents_[type];
+}
+
+
 bool Foam::dimensionSet::operator==(const dimensionSet& ds) const
 {
     for (int Dimension=0; Dimension < nDimensions; ++Dimension)
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.H b/src/OpenFOAM/dimensionSet/dimensionSet.H
index 5bdb41c332..ca4c3ed2d1 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.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
@@ -40,10 +40,12 @@ SourceFiles
 #ifndef dimensionSet_H
 #define dimensionSet_H
 
-#include "scalar.H"
 #include "bool.H"
 #include "dimensionedScalarFwd.H"
 #include "className.H"
+#include "scalarField.H"
+#include "PtrList.H"
+#include "HashTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,6 +55,7 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 class dimensionSet;
+class dimensionSets;
 
 // Friend functions
 
@@ -140,6 +143,64 @@ public:
 
 private:
 
+    // Private classes
+
+        class tokeniser
+        {
+            // Private data
+
+                Istream& is_;
+
+                List<token> tokens_;
+
+                label start_;
+
+                label size_;
+
+            // Private Member Functions
+
+                void push(const token&);
+
+                token pop();
+
+                void unpop(const token&);
+
+        public:
+
+            // Constructors
+
+                 tokeniser(Istream&);
+
+            // Member Functions
+
+                Istream& stream()
+                {
+                    return is_;
+                }
+
+                bool hasToken() const;
+
+                token nextToken();
+
+                void putBack(const token&);
+
+                void splitWord(const word&);
+
+                static bool valid(char c);
+
+                static label priority(const token& t);
+
+        };
+
+
+        dimensionedScalar parse
+        (
+            const label lastPrior,
+            tokeniser& tis,
+            const HashTable<dimensionedScalar>&
+        ) const;
+
+
     // private data
 
         // dimensionSet stored as an array of dimension exponents
@@ -189,14 +250,56 @@ public:
 
         void reset(const dimensionSet&);
 
-        //- Return a text representation for added readability
-        string asText() const;
+
+    // I/O
+
+        //- Read using provided units. Used only in initial parsing
+        Istream& read
+        (
+            Istream& is,
+            scalar& multiplier,
+            const dictionary&
+        );
+
+        //- Read using provided units
+        Istream& read
+        (
+            Istream& is,
+            scalar& multiplier,
+            const HashTable<dimensionedScalar>&
+        );
+
+        //- Read using system units
+        Istream& read
+        (
+            Istream& is,
+            scalar& multiplier
+        );
+
+        //- Write using provided units
+        Ostream& write
+        (
+            Ostream& os,
+            scalar& multiplier,
+            const dimensionSets&
+        ) const;
+
+        //- Write using system units
+        Ostream& write
+        (
+            Ostream& os,
+            scalar& multiplier
+        ) const;
 
 
     // Member operators
 
         scalar operator[](const dimensionType) const;
         scalar& operator[](const dimensionType);
+
+        scalar operator[](const label) const;
+        scalar& operator[](const label);
+
         bool operator==(const dimensionSet&) const;
         bool operator!=(const dimensionSet&) const;
 
diff --git a/src/OpenFOAM/dimensionSet/dimensionSetIO.C b/src/OpenFOAM/dimensionSet/dimensionSetIO.C
index d27e9f1b99..d41348e208 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSetIO.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSetIO.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
@@ -25,6 +25,7 @@ License
 
 #include "dimensionSet.H"
 #include "IOstreams.H"
+#include "dimensionedScalar.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -34,46 +35,670 @@ Foam::dimensionSet::dimensionSet(Istream& is)
 }
 
 
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+Foam::dimensionSet::tokeniser::tokeniser(Istream& is)
+:
+    is_(is),
+    tokens_(100),
+    start_(0),
+    size_(0)
+{}
 
-Foam::Istream& Foam::operator>>(Istream& is, dimensionSet& dset)
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::dimensionSet::tokeniser::push(const token& t)
 {
-    // Read begining of dimensionSet
-    if (token(is) != token::BEGIN_SQR)
+    label end = (start_+size_)%tokens_.size();
+    tokens_[end] = t;
+    if (size_ == tokens_.size())
     {
-        Info<< "expected a " << token::BEGIN_SQR << " in dimensionSet"
-            << endl << "in stream " << is.info() << endl;
+        start_ = tokens_.fcIndex(start_);
+    }
+    else
+    {
+        size_++;
+    }
+}
+
+
+Foam::token Foam::dimensionSet::tokeniser::pop()
+{
+    token t = tokens_[start_];
+    start_ = tokens_.fcIndex(start_);
+    --size_;
+    return t;
+}
+
+
+void Foam::dimensionSet::tokeniser::unpop(const token& t)
+{
+    ++size_;
+    start_ = tokens_.rcIndex(start_);
+    tokens_[start_] = t;
+}
+
+
+bool Foam::dimensionSet::tokeniser::hasToken() const
+{
+    return size_ || is_.good();
+}
+
+
+bool Foam::dimensionSet::tokeniser::valid(char c)
+{
+    return
+    (
+        !isspace(c)
+     && c != '"'   // string quote
+     && c != '\''  // string quote
+     && c != '/'   // div
+     && c != ';'   // end statement
+     && c != '{'   // beg subdict
+     && c != '}'   // end subdict
+     && c != '('   // beg expr
+     && c != ')'   // end expr
+     && c != '['   // beg dim
+     && c != ']'   // end dim
+     && c != '^'   // power
+     && c != '*'   // mult
+    );
+}
+
+
+Foam::label Foam::dimensionSet::tokeniser::priority(const token& t)
+{
+    if (!t.isPunctuation())
+    {
+        return 0;
+    }
+    else if
+    (
+        t.pToken() == token::MULTIPLY
+     || t.pToken() == token::DIVIDE
+    )
+    {
+        return 2;
+    }
+    else if (t.pToken() == '^')
+    {
+        return 3;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+void Foam::dimensionSet::tokeniser::splitWord(const word& w)
+{
+    size_t start = 0;
+    for (size_t i=0; i<w.size(); ++i)
+    {
+        if (!valid(w[i]))
+        {
+            if (i > start)
+            {
+                word subWord = w(start, i-start);
+                if (isdigit(subWord[0]) || subWord[0] == token::SUBTRACT)
+                {
+                    push(token(readLabel(IStringStream(subWord)())));
+                }
+                else
+                {
+                    push(token(subWord));
+                }
+            }
+            if (w[i] != token::SPACE)
+            {
+                if (isdigit(w[i]))
+                {
+                    push(token(readLabel(IStringStream(w[i])())));
+                }
+                else
+                {
+                    push(token::punctuationToken(w[i]));
+                }
+            }
+            start = i+1;
+        }
+    }
+    if (start < w.size())
+    {
+        word subWord = w(start, w.size()-start);
+        if (isdigit(subWord[0]) || subWord[0] == token::SUBTRACT)
+        {
+            push(token(readLabel(IStringStream(subWord)())));
+        }
+        else
+        {
+            push(token(subWord));
+        }
+    }
+}
+
+
+Foam::token Foam::dimensionSet::tokeniser::nextToken()
+{
+    if (size_ == 0)
+    {
+        token t(is_);
+        if (t.isWord())
+        {
+            splitWord(t.wordToken());
+            return pop();
+        }
+        else
+        {
+            return t;
+        }
+    }
+    else
+    {
+        return pop();
+    }
+}
+
+
+void Foam::dimensionSet::tokeniser::putBack(const token& t)
+{
+    if (size_ == 0)
+    {
+        push(t);
+    }
+    else
+    {
+        unpop(t);
+    }
+}
+
+
+Foam::dimensionedScalar Foam::dimensionSet::parse
+(
+    const label lastPrior,
+    tokeniser& tis,
+    const HashTable<dimensionedScalar>& readSet
+) const
+{
+    dimensionedScalar ds("", dimless, 1.0);
+
+    // Get initial token
+    token nextToken(tis.nextToken());
+
+    // Store type of last token read. Used to detect two consecutive
+    // symbols and assume multiplication
+    bool haveReadSymbol = false;
+
+
+    while (true)
+    {
+        if (nextToken.isWord())
+        {
+            const word& unitName = nextToken.wordToken();
+            const dimensionedScalar& unitDim = readSet[unitName];
+            ds.dimensions() *= unitDim.dimensions();
+            ds.value() *= unitDim.value();
+            haveReadSymbol = true;
+        }
+        else if (nextToken.isNumber())
+        {
+            // no dimensions, just value
+            ds.value() *= nextToken.number();
+            haveReadSymbol = true;
+        }
+        else if (nextToken.isPunctuation())
+        {
+            label nextPrior = tokeniser::priority(nextToken);
+
+            if (nextToken.pToken() == token::BEGIN_SQR)
+            {
+                // No idea when this will happen
+                tis.putBack(nextToken);
+                return ds;
+            }
+            else if (nextToken.pToken() == token::END_SQR)
+            {
+                tis.putBack(nextToken);
+                return ds;
+            }
+            else if (nextToken.pToken() == token::BEGIN_LIST)
+            {
+                dimensionedScalar sub(parse(nextPrior, tis, readSet));
+
+                token t = tis.nextToken();
+                if (!t.isPunctuation()  || t.pToken() !=  token::END_LIST)
+                {
+                    FatalIOErrorIn
+                    (
+                        "dimensionSet::parse"
+                        "(const label, tokeniser&"
+                        ", const HashTable<dimensionedScalar>&)",
+                        tis.stream()
+                    )   << "Illegal token " << t << exit(FatalIOError);
+                }
+
+                ds.dimensions() *= sub.dimensions();
+                ds.value() *= sub.value();
+
+                haveReadSymbol = true;
+            }
+            else if (nextToken.pToken() == token::END_LIST)
+            {
+                tis.putBack(nextToken);
+                return ds;
+            }
+            else if (nextToken.pToken() == token::MULTIPLY)
+            {
+                if (nextPrior > lastPrior)
+                {
+                    dimensionedScalar sub(parse(nextPrior, tis, readSet));
+
+                    ds.dimensions() *= sub.dimensions();
+                    ds.value() *= sub.value();
+                }
+                else
+                {
+                    // Restore token
+                    tis.putBack(nextToken);
+                    return ds;
+                }
+                haveReadSymbol = false;
+            }
+            else if (nextToken.pToken() == token::DIVIDE)
+            {
+                if (nextPrior > lastPrior)
+                {
+                    dimensionedScalar sub(parse(nextPrior, tis, readSet));
+
+                    ds.dimensions() /= sub.dimensions();
+                    ds.value() /= sub.value();
+                }
+                else
+                {
+                    tis.putBack(nextToken);
+                    return ds;
+                }
+                haveReadSymbol = false;
+            }
+            else if (nextToken.pToken() == '^')
+            {
+                if (nextPrior > lastPrior)
+                {
+                    dimensionedScalar exp(parse(nextPrior, tis, readSet));
+
+                    ds.dimensions().reset(pow(ds.dimensions(), exp.value()));
+                    ds.value() = Foam::pow(ds.value(), exp.value());
+                }
+                else
+                {
+                    tis.putBack(nextToken);
+                    return ds;
+                }
+                haveReadSymbol = false;
+            }
+            else
+            {
+                FatalIOErrorIn
+                (
+                    "dimensionSet::parse"
+                    "(const label, tokeniser&"
+                    ", const HashTable<dimensionedScalar>&)",
+                    tis.stream()
+                )   << "Illegal token " << nextToken << exit(FatalIOError);
+            }
+        }
+        else
+        {
+            FatalIOErrorIn
+            (
+                "dimensionSet::parse"
+                "(const label, tokeniser&"
+                ", const HashTable<dimensionedScalar>&)",
+                tis.stream()
+            )   << "Illegal token " << nextToken << exit(FatalIOError);
+        }
+
+
+        if (!tis.hasToken())
+        {
+            break;
+        }
+
+        nextToken = tis.nextToken();
+        if (nextToken.error())
+        {
+            break;
+        }
+
+        if (haveReadSymbol && (nextToken.isWord() || nextToken.isNumber()))
+        {
+            // Two consecutive symbols. Assume multiplication
+            tis.putBack(nextToken);
+            nextToken = token(token::MULTIPLY);
+        }
     }
 
-    // Read first five dimensions
-    for (int Dimension=0; Dimension<dimensionSet::CURRENT; Dimension++)
+    return ds;
+}
+
+
+Foam::Istream& Foam::dimensionSet::read
+(
+    Istream& is,
+    scalar& multiplier,
+    const HashTable<dimensionedScalar>& readSet
+)
+{
+    multiplier = 1.0;
+
+    // Read begining of dimensionSet
+    token startToken(is);
+
+    if (startToken != token::BEGIN_SQR)
     {
-        is >> dset.exponents_[Dimension];
+        FatalIOErrorIn
+        (
+            "dimensionSet::read"
+            "(Istream&, scalar&, const HashTable<dimensionedScalar>&)",
+            is
+        )   << "expected a " << token::BEGIN_SQR << " in dimensionSet"
+            << endl << "in stream " << is.info()
+            << exit(FatalIOError);
     }
 
     // Read next token
     token nextToken(is);
 
-    // If next token is another number
-    // read last two dimensions
-    // and then read another token for the end of the dimensionSet
-    if (nextToken.isNumber())
+    if (!nextToken.isNumber())
     {
-        dset.exponents_[dimensionSet::CURRENT] = nextToken.number();
-        is >> dset.exponents_[dimensionSet::LUMINOUS_INTENSITY];
-        is >> nextToken;
+        is.putBack(nextToken);
+
+        tokeniser tis(is);
+
+        dimensionedScalar ds(parse(0, tis, readSet));
+
+        multiplier = ds.value();
+        for (int i=0; i < dimensionSet::nDimensions; ++i)
+        {
+            exponents_[i] = ds.dimensions()[i];
+        }
     }
     else
     {
-        dset.exponents_[dimensionSet::CURRENT] = 0;
-        dset.exponents_[dimensionSet::LUMINOUS_INTENSITY] = 0;
+        // Read first five dimensions
+        exponents_[dimensionSet::MASS] = nextToken.number();
+        for (int Dimension=1; Dimension<dimensionSet::CURRENT; Dimension++)
+        {
+            is >> exponents_[Dimension];
+        }
+
+        // Read next token
+        token nextToken(is);
+
+        // If next token is another number
+        // read last two dimensions
+        // and then read another token for the end of the dimensionSet
+        if (nextToken.isNumber())
+        {
+            exponents_[dimensionSet::CURRENT] = nextToken.number();
+            is >> nextToken;
+            exponents_[dimensionSet::LUMINOUS_INTENSITY] = nextToken.number();
+            is >> nextToken;
+        }
+        else
+        {
+            exponents_[dimensionSet::CURRENT] = 0;
+            exponents_[dimensionSet::LUMINOUS_INTENSITY] = 0;
+        }
+
+        // Check end of dimensionSet
+        if (nextToken != token::END_SQR)
+        {
+            FatalIOErrorIn
+            (
+                "dimensionSet::read"
+                "(Istream&, scalar&, const HashTable<dimensionedScalar>&)",
+                is
+            )   << "expected a " << token::END_SQR << " in dimensionSet "
+                << endl << "in stream " << is.info()
+                << exit(FatalIOError);
+        }
+    }
+    // Check state of Istream
+    is.check("Istream& operator>>(Istream&, dimensionSet&)");
+
+    return is;
+}
+
+
+Foam::Istream& Foam::dimensionSet::read
+(
+    Istream& is,
+    scalar& multiplier
+)
+{
+    return read(is, multiplier, unitSet());
+}
+
+
+Foam::Istream& Foam::dimensionSet::read
+(
+    Istream& is,
+    scalar& multiplier,
+    const dictionary& readSet
+)
+{
+    multiplier = 1.0;
+
+    // Read begining of dimensionSet
+    token startToken(is);
+
+    if (startToken != token::BEGIN_SQR)
+    {
+        FatalIOErrorIn
+        (
+            "dimensionSet::read"
+            "(Istream&, scalar&, const dictionary&)",
+            is
+        )   << "expected a " << token::BEGIN_SQR << " in dimensionSet"
+            << endl << "in stream " << is.info()
+            << exit(FatalIOError);
     }
 
-    // Check end of dimensionSet
-    if (nextToken != token::END_SQR)
+    // Read next token
+    token nextToken(is);
+
+    if (nextToken.isWord())
     {
-        Info<< "expected a " << token::END_SQR << " in dimensionSet"
-            << endl << "in stream " << is.info() << endl;
+        bool continueParsing = true;
+        do
+        {
+            word symbolPow = nextToken.wordToken();
+            if (symbolPow[symbolPow.size()-1] == token::END_SQR)
+            {
+                symbolPow = symbolPow(0, symbolPow.size()-1);
+                continueParsing = false;
+            }
+
+
+            // Parse unit
+            dimensionSet symbolSet(dimless);
+
+            size_t index = symbolPow.find('^');
+            if (index != string::npos)
+            {
+                word symbol = symbolPow(0, index);
+                word exp = symbolPow(index+1, symbolPow.size()-index+1);
+                scalar exponent = readScalar(IStringStream(exp)());
+
+                dimensionedScalar s;
+                s.read(readSet[symbol], readSet);
+
+                symbolSet.reset(pow(s.dimensions(), exponent));
+                multiplier *= Foam::pow(s.value(), exponent);
+            }
+            else
+            {
+                dimensionedScalar s;
+                s.read(readSet[symbolPow], readSet);
+
+                symbolSet.reset(s.dimensions());
+                multiplier *= s.value();
+            }
+
+            // Add dimensions without checking
+            for (int i=0; i < dimensionSet::nDimensions; ++i)
+            {
+                exponents_[i] += symbolSet[i];
+            }
+
+            if (continueParsing)
+            {
+                nextToken = token(is);
+
+                if (!nextToken.isWord() || nextToken == token::END_SQR)
+                {
+                    continueParsing = false;
+                }
+            }
+        }
+        while (continueParsing);
+    }
+    else
+    {
+        // Read first five dimensions
+        exponents_[dimensionSet::MASS] = nextToken.number();
+        for (int Dimension=1; Dimension<dimensionSet::CURRENT; Dimension++)
+        {
+            is >> exponents_[Dimension];
+        }
+
+        // Read next token
+        token nextToken(is);
+
+        // If next token is another number
+        // read last two dimensions
+        // and then read another token for the end of the dimensionSet
+        if (nextToken.isNumber())
+        {
+            exponents_[dimensionSet::CURRENT] = nextToken.number();
+            is >> nextToken;
+            exponents_[dimensionSet::LUMINOUS_INTENSITY] = nextToken.number();
+            is >> nextToken;
+        }
+        else
+        {
+            exponents_[dimensionSet::CURRENT] = 0;
+            exponents_[dimensionSet::LUMINOUS_INTENSITY] = 0;
+        }
+
+        // Check end of dimensionSet
+        if (nextToken != token::END_SQR)
+        {
+            FatalIOErrorIn
+            (
+                "dimensionSet::read"
+                "(Istream&, scalar&, const dictionary&)",
+                is
+            )   << "expected a " << token::END_SQR << " in dimensionSet "
+                << endl << "in stream " << is.info()
+                << exit(FatalIOError);
+        }
+    }
+
+    // Check state of Istream
+    is.check("Istream& operator>>(Istream&, dimensionSet&)");
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::dimensionSet::write
+(
+    Ostream& os,
+    scalar& multiplier,
+    const dimensionSets& writeUnits
+) const
+{
+    multiplier = 1.0;
+
+    os << token::BEGIN_SQR;
+
+    if (writeUnits.valid())
+    {
+        scalarField exponents(dimensionSet::nDimensions);
+        for (int d=0; d<dimensionSet::nDimensions; d++)
+        {
+            exponents[d] = exponents_[d];
+        }
+        writeUnits.coefficients(exponents);
+
+        bool hasPrinted = false;
+        forAll(exponents, i)
+        {
+            if (mag(exponents[i]) > smallExponent)
+            {
+                const dimensionedScalar& ds = writeUnits.units()[i];
+
+                if (hasPrinted)
+                {
+                    os  << token::SPACE;
+                }
+                hasPrinted = true;
+                os  << ds.name();
+                if (mag(exponents[i]-1) > smallExponent)
+                {
+                    os  << '^' << exponents[i];
+
+                    multiplier *= Foam::pow(ds.value(), exponents[i]);
+                }
+                else
+                {
+                    multiplier *= ds.value();
+                }
+            }
+        }
+    }
+    else
+    {
+        for (int d=0; d<dimensionSet::nDimensions-1; d++)
+        {
+            os << exponents_[d] << token::SPACE;
+        }
+        os << exponents_[dimensionSet::nDimensions-1];
+    }
+
+    os  << token::END_SQR;
+
+    // Check state of Ostream
+    os.check("Ostream& operator<<(Ostream&, const dimensionSet&)");
+
+    return os;
+}
+
+
+Foam::Ostream& Foam::dimensionSet::write
+(
+    Ostream& os,
+    scalar& multiplier
+) const
+{
+    return write(os, multiplier, writeUnitSet());
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, dimensionSet& dset)
+{
+    scalar multiplier;
+    dset.read(is, multiplier);
+
+    if (mag(multiplier-1.0) > dimensionSet::smallExponent)
+    {
+        FatalIOErrorIn("Foam::operator>>(Istream&, dimensionSet&)", is)
+            << "Cannot use scaled units in dimensionSet"
+            << exit(FatalIOError);
     }
 
     // Check state of Istream
@@ -85,13 +710,8 @@ Foam::Istream& Foam::operator>>(Istream& is, dimensionSet& dset)
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const dimensionSet& dset)
 {
-    os << token::BEGIN_SQR;
-
-    for (int Dimension=0; Dimension<dimensionSet::nDimensions-1; Dimension++)
-    {
-        os << dset.exponents_[Dimension] << token::SPACE;
-    }
-    os << dset.exponents_[dimensionSet::nDimensions-1] << token::END_SQR;
+    scalar multiplier;
+    dset.write(os, multiplier);
 
     // Check state of Ostream
     os.check("Ostream& operator<<(Ostream&, const dimensionSet&)");
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C
index bdcd8096b8..474be10181 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.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
@@ -24,34 +24,210 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dimensionSet.H"
+#include "dimensionedScalar.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-const Foam::dimensionSet Foam::dimless(0, 0, 0, 0, 0, 0, 0);
+namespace Foam
+{
 
-const Foam::dimensionSet Foam::dimMass(1, 0, 0, 0, 0, 0, 0);
-const Foam::dimensionSet Foam::dimLength(0, 1, 0, 0, 0, 0, 0);
-const Foam::dimensionSet Foam::dimTime(0, 0, 1, 0, 0, 0, 0);
-const Foam::dimensionSet Foam::dimTemperature(0, 0, 0, 1, 0, 0, 0);
-const Foam::dimensionSet Foam::dimMoles(0, 0, 0, 0, 1, 0, 0);
-const Foam::dimensionSet Foam::dimCurrent(0, 0, 0, 0, 0, 1, 0);
-const Foam::dimensionSet Foam::dimLuminousIntensity(0, 0, 0, 0, 0, 0, 1);
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-const Foam::dimensionSet Foam::dimArea(sqr(dimLength));
-const Foam::dimensionSet Foam::dimVolume(pow3(dimLength));
-const Foam::dimensionSet Foam::dimVol(dimVolume);
+dictionary* dimensionSystemsPtr_(NULL);
 
-const Foam::dimensionSet Foam::dimVelocity(dimLength/dimTime);
-const Foam::dimensionSet Foam::dimAcceleration(dimVelocity/dimTime);
+dictionary& dimensionSystems()
+{
+    return debug::switchSet
+    (
+        "DimensionSets",
+        dimensionSystemsPtr_
+    );
+}
 
-const Foam::dimensionSet Foam::dimDensity(dimMass/dimVolume);
-const Foam::dimensionSet Foam::dimForce(dimMass*dimAcceleration);
-const Foam::dimensionSet Foam::dimEnergy(dimForce*dimLength);
-const Foam::dimensionSet Foam::dimPower(dimEnergy/dimTime);
 
-const Foam::dimensionSet Foam::dimPressure(dimForce/dimArea);
-const Foam::dimensionSet Foam::dimGasConstant(dimEnergy/dimMass/dimTemperature);
-const Foam::dimensionSet Foam::dimSpecificHeatCapacity(dimGasConstant);
+/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
+autoPtr<HashTable<dimensionedScalar> > unitSetPtr_;
+autoPtr<dimensionSets> writeUnitSetPtr_;
+
+
+const HashTable<dimensionedScalar>& unitSet()
+{
+    if (!unitSetPtr_.valid())
+    {
+        const dictionary& dict = dimensionSystems();
+
+        if (!dict.found("unitSet"))
+        {
+            FatalIOErrorIn("unitSet()", dict)
+                << "Cannot find unitSet in dictionary " << dict.name()
+                << exit(FatalIOError);
+        }
+
+        const word unitSetCoeffs(word(dict.lookup("unitSet")) + "Coeffs");
+
+        if (!dict.found(unitSetCoeffs))
+        {
+            FatalIOErrorIn("unitSet()", dict)
+                << "Cannot find " << unitSetCoeffs << " in dictionary "
+                << dict.name() << exit(FatalIOError);
+        }
+
+        const dictionary& unitDict = dict.subDict(unitSetCoeffs);
+
+        unitSetPtr_.reset
+        (
+            new HashTable<dimensionedScalar>(unitDict.size())
+        );
+
+        forAllConstIter(dictionary, unitDict, iter)
+        {
+            if (iter().keyword() != "writeUnits")
+            {
+                dimensionedScalar dt;
+                dt.read(iter().stream(), unitDict);
+                bool ok = unitSetPtr_->insert(iter().keyword(), dt);
+                if (!ok)
+                {
+                    FatalIOErrorIn("unitSet()", dict)
+                        << "Duplicate unit " << iter().keyword()
+                        << " in DimensionSets dictionary"
+                        << exit(FatalIOError);
+                }
+            }
+        }
+
+        wordList writeUnitNames
+        (
+            unitDict.lookupOrDefault<wordList>
+            (
+                "writeUnits",
+                wordList(0)
+            )
+        );
+
+        writeUnitSetPtr_.reset
+        (
+            new dimensionSets
+            (
+                unitSetPtr_(),
+                writeUnitNames
+            )
+        );
+
+        if (writeUnitNames.size() != 0 && writeUnitNames.size() != 7)
+        {
+            FatalIOErrorIn("unitSet()", dict)
+                << "Cannot find entry \"writeUnits\" in " << unitDict.name()
+                << " or it is not a wordList of size 7"
+                << exit(FatalIOError);
+        }
+    }
+    return unitSetPtr_();
+}
+
+
+const dimensionSets& writeUnitSet()
+{
+    if (!writeUnitSetPtr_.valid())
+    {
+        (void)unitSet();
+    }
+    return writeUnitSetPtr_();
+}
+
+
+const dimensionSet dimless(0, 0, 0, 0, 0, 0, 0);
+
+const dimensionSet dimMass(1, 0, 0, 0, 0, 0, 0);
+const dimensionSet dimLength(0, 1, 0, 0, 0, 0, 0);
+const dimensionSet dimTime(0, 0, 1, 0, 0, 0, 0);
+const dimensionSet dimTemperature(0, 0, 0, 1, 0, 0, 0);
+const dimensionSet dimMoles(0, 0, 0, 0, 1, 0, 0);
+const dimensionSet dimCurrent(0, 0, 0, 0, 0, 1, 0);
+const dimensionSet dimLuminousIntensity(0, 0, 0, 0, 0, 0, 1);
+
+const dimensionSet dimArea(sqr(dimLength));
+const dimensionSet dimVolume(pow3(dimLength));
+const dimensionSet dimVol(dimVolume);
+
+const dimensionSet dimVelocity(dimLength/dimTime);
+const dimensionSet dimAcceleration(dimVelocity/dimTime);
+
+const dimensionSet dimDensity(dimMass/dimVolume);
+const dimensionSet dimForce(dimMass*dimAcceleration);
+const dimensionSet dimEnergy(dimForce*dimLength);
+const dimensionSet dimPower(dimEnergy/dimTime);
+
+const dimensionSet dimPressure(dimForce/dimArea);
+const dimensionSet dimGasConstant(dimEnergy/dimMass/dimTemperature);
+const dimensionSet dimSpecificHeatCapacity(dimGasConstant);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::dimensionSets::dimensionSets
+(
+    const HashTable<dimensionedScalar>& units,
+    const wordList& unitNames
+)
+:
+    units_(unitNames.size()),
+    conversion_(unitNames.size()),
+    conversionPivots_(unitNames.size()),
+    valid_(false)
+{
+    forAll(unitNames, i)
+    {
+        units_.set
+        (
+            i,
+            new dimensionedScalar
+            (
+                units[unitNames[i]]
+            )
+        );
+    }
+
+    if (unitNames.size() == 7)
+    {
+        valid_ = true;
+
+        // Determine conversion from basic units to write units
+        for (label rowI = 0; rowI < conversion_.n(); rowI++)
+        {
+            scalar* row = conversion_[rowI];
+
+            for (label columnI = 0; columnI < conversion_.m(); columnI++)
+            {
+                const dimensionedScalar& dSet = units_[columnI];
+                row[columnI] = dSet.dimensions()[rowI];
+            }
+        }
+        conversionPivots_.setSize(conversion_.n());
+        LUDecompose(conversion_, conversionPivots_);
+
+        //- possibly some optimisation here to detect identity matri
+        //if
+        //(
+        //    conversionPivots_ == identity(conversionPivots_.size())
+        // && conversion_ == I)
+        //)
+        //{
+        //    identity_ = true;
+        //}
+    }
+}
+
+
+void Foam::dimensionSets::coefficients(scalarField& exponents) const
+{
+    LUBacksubstitute(conversion_, conversionPivots_, exponents);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.H b/src/OpenFOAM/dimensionSet/dimensionSets.H
index 7d8dba56ef..bcd6a5edae 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.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
@@ -36,6 +36,10 @@ SourceFiles
 #ifndef dimensionSets_H
 #define dimensionSets_H
 
+#include "scalarMatrices.H"
+#include "dimensionedScalarFwd.H"
+#include "PtrList.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -69,6 +73,65 @@ extern const dimensionSet dimGasConstant;
 extern const dimensionSet dimSpecificHeatCapacity;
 
 
+
+class dimensionSets
+{
+    // Private data
+
+        //- Set of dimensions
+        PtrList<dimensionedScalar> units_;
+
+        //- LU decomposition of dimensions
+        scalarSquareMatrix conversion_;
+
+        //- See above
+        labelList conversionPivots_;
+
+        //- Is LU decomposition valid
+        bool valid_;
+
+public:
+
+    // Constructors
+
+        //- Construct from all units and set of units to use for inversion
+        //  (writing)
+        dimensionSets
+        (
+            const HashTable<dimensionedScalar>&,
+            const wordList& unitNames
+        );
+
+    // Member functions
+
+        //- Return the units
+        const PtrList<dimensionedScalar>& units() const
+        {
+            return units_;
+        }
+
+        //- Is there a valid inverse of the selected unit
+        bool valid() const
+        {
+            return valid_;
+        }
+
+        //- (if valid) obtain set of coefficients of unitNames
+        void coefficients(scalarField&) const;
+
+};
+
+
+//- Top level dictionary
+dictionary& dimensionSystems();
+
+//- Set of all dimensions
+const HashTable<dimensionedScalar>& unitSet();
+
+//- Set of units
+const dimensionSets& writeUnitSet();
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 4e96c3012a..73fea9fdd2 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -97,10 +97,10 @@ dimensioned<Type>::dimensioned
     Istream& is
 )
 :
-    name_(is),
-    dimensions_(is),
-    value_(pTraits<Type>(is))
-{}
+    dimensions_(dimless)
+{
+    read(is);
+}
 
 
 template <class Type>
@@ -111,9 +111,13 @@ dimensioned<Type>::dimensioned
 )
 :
     name_(name),
-    dimensions_(is),
-    value_(pTraits<Type>(is))
-{}
+    dimensions_(dimless)
+{
+    scalar multiplier;
+    dimensions_.read(is, multiplier);
+    is >> value_;
+    value_ *= multiplier;
+}
 
 
 template <class Type>
@@ -141,24 +145,29 @@ dimensioned<Type>::dimensioned
     }
 
     // If the dimensions are provided compare with the argument
+    scalar multiplier = 1.0;
+
     if (nextToken == token::BEGIN_SQR)
     {
-        dimensionSet dims(is);
+        dimensionSet dims(dimless);
+        dims.read(is, multiplier);
 
         if (dims != dimensions_)
         {
-            FatalErrorIn
+            FatalIOErrorIn
             (
                 "dimensioned<Type>::dimensioned"
-                "(const word&, const dimensionSet&, Istream&)"
+                "(const word&, const dimensionSet&, Istream&)",
+                is
             ) << "The dimensions " << dims
               << " provided do not match the required dimensions "
               << dimensions_
-              << abort(FatalError);
+              << abort(FatalIOError);
         }
     }
 
     is >> value_;
+    value_ *= multiplier;
 }
 
 
@@ -247,6 +256,83 @@ bool dimensioned<Type>::readIfPresent(const dictionary& dict)
 }
 
 
+template <class Type>
+Foam::Istream& dimensioned<Type>::read(Istream& is, const dictionary& readSet)
+{
+    // Read name
+    is >> name_;
+
+    // Read dimensionSet + multiplier
+    scalar mult;
+    dimensions_.read(is, mult, readSet);
+
+    // Read value
+    is >> value_;
+    value_ *= mult;
+
+    // Check state of Istream
+    is.check
+    (
+        "Istream& dimensioned<Type>::read(Istream& is, const dictionary&)"
+    );
+
+    return is;
+}
+
+
+template <class Type>
+Foam::Istream& dimensioned<Type>::read
+(
+    Istream& is,
+    const HashTable<dimensionedScalar>& readSet
+)
+{
+    // Read name
+    is >> name_;
+
+    // Read dimensionSet + multiplier
+    scalar mult;
+    dimensions_.read(is, mult, readSet);
+
+    // Read value
+    is >> value_;
+    value_ *= mult;
+
+    // Check state of Istream
+    is.check
+    (
+        "Istream& dimensioned<Type>::read"
+        "(Istream& is, const HashTable<dimensionedScalar>&)"
+    );
+
+    return is;
+}
+
+
+template <class Type>
+Foam::Istream& dimensioned<Type>::read(Istream& is)
+{
+    // Read name
+    is >> name_;
+
+    // Read dimensionSet + multiplier
+    scalar mult;
+    dimensions_.read(is, mult);
+
+    // Read value
+    is >> value_;
+    value_ *= mult;
+
+    // Check state of Istream
+    is.check
+    (
+        "Istream& dimensioned<Type>::read(Istream& is)"
+    );
+
+    return is;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template <class Type>
@@ -414,13 +500,15 @@ Istream& operator>>(Istream& is, dimensioned<Type>& dt)
     }
 
     // If the dimensions are provided reset the dimensions to those read
+    scalar multiplier = 1.0;
     if (nextToken == token::BEGIN_SQR)
     {
-        is >> dt.dimensions_;
+        dt.dimensions_.read(is, multiplier);
     }
 
     // Read the value
     is >> dt.value_;
+    dt.value_ *= multiplier;
 
     // Check state of Istream
     is.check("Istream& operator>>(Istream&, dimensioned<Type>&)");
@@ -432,10 +520,17 @@ Istream& operator>>(Istream& is, dimensioned<Type>& dt)
 template <class Type>
 Ostream& operator<<(Ostream& os, const dimensioned<Type>& dt)
 {
-    // do a stream write op for a dimensions()et
-    os  << dt.name() << token::SPACE
-        << dt.dimensions() << token::SPACE
-        << dt.value();
+    // Write the name
+    os << dt.name() << token::SPACE;
+
+    // Write the dimensions
+    scalar mult;
+    dt.dimensions().write(os, mult);
+
+    os << token::SPACE;
+
+    // Write the value
+    os << dt.value()/mult;
 
     // Check state of Ostream
     os.check("Ostream& operator<<(Ostream&, const dimensioned<Type>&)");
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 3cb8e0222a..8f5108df0b 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.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
@@ -163,6 +163,17 @@ public:
         bool readIfPresent(const dictionary&);
 
 
+    // I/O
+
+        //- Read using provided units. Only used during startup.
+        Istream& read(Istream& is, const dictionary&);
+
+        //- Read using provided units
+        Istream& read(Istream& is, const HashTable<dimensionedScalar>&);
+
+        //- Read using system units
+        Istream& read(Istream& is);
+
     // Member operators
 
         //- Return a component as a dimensioned<cmptType>
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
index 2879e28f10..1fd8eac973 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
@@ -48,8 +48,10 @@ Foam::UniformDimensionedField<Type>::UniformDimensionedField
     )
     {
         dictionary dict(readStream(typeName));
-        this->dimensions().reset(dict.lookup("dimensions"));
+        scalar multiplier;
+        this->dimensions().read(dict.lookup("dimensions"), multiplier);
         dict.lookup("value") >> this->value();
+        this->value() *= multiplier;
     }
 }
 
@@ -75,8 +77,10 @@ Foam::UniformDimensionedField<Type>::UniformDimensionedField
     dimensioned<Type>(regIOobject::name(), dimless, pTraits<Type>::zero)
 {
     dictionary dict(readStream(typeName));
-    this->dimensions().reset(dict.lookup("dimensions"));
+    scalar multiplier;
+    this->dimensions().read(dict.lookup("dimensions"), multiplier);
     dict.lookup("value") >> this->value();
+    this->value() *= multiplier;
 }
 
 
@@ -92,9 +96,11 @@ Foam::UniformDimensionedField<Type>::~UniformDimensionedField()
 template<class Type>
 bool Foam::UniformDimensionedField<Type>::writeData(Ostream& os) const
 {
-    os.writeKeyword("dimensions") << this->dimensions() << token::END_STATEMENT
+    scalar multiplier;
+    os.writeKeyword("dimensions");
+    this->dimensions().write(os, multiplier) << token::END_STATEMENT
         << nl;
-    os.writeKeyword("value") << this->value() << token::END_STATEMENT
+    os.writeKeyword("value") << this->value()/multiplier << token::END_STATEMENT
         << nl << nl;
 
     return (os.good());
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
             {
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 0bd3442d69..845199717f 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.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
@@ -79,6 +79,9 @@ public:
         //- Construct copy and increment reference count
         inline tmp(const tmp<T>&);
 
+        //- Construct copy transferring content of temporary if required
+        inline tmp(const tmp<T>&, bool allowTransfer);
+
 
     //- Destructor, delete object when reference count == 0
     inline ~tmp();
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index bfd3831692..c3a51f3564 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.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
@@ -68,6 +68,38 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t)
 }
 
 
+template<class T>
+inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
+:
+    isTmp_(t.isTmp_),
+    ptr_(t.ptr_),
+    ref_(t.ref_)
+{
+    if (isTmp_)
+    {
+        if (allowTransfer)
+        {
+            const_cast<tmp<T>&>(t).ptr_ = 0;
+        }
+        else
+        {
+            if (ptr_)
+            {
+                ptr_->operator++();
+            }
+            else
+            {
+                FatalErrorIn
+                (
+                    "Foam::tmp<T>::tmp(const tmp<T>&, bool allowTransfer)"
+                )   << "attempted copy of a deallocated temporary"
+                    << abort(FatalError);
+            }
+        }
+    }
+}
+
+
 template<class T>
 inline Foam::tmp<T>::~tmp()
 {
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index e7493b78e9..194309cd3c 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.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
@@ -322,7 +322,12 @@ Foam::string& Foam::stringOps::inplaceExpand
 
 
                 // lookup in the dictionary
-                const entry* ePtr = dict.lookupEntryPtr(varName, true, true);
+                const entry* ePtr = dict.lookupScopedEntryPtr
+                (
+                    varName,
+                    true,
+                    false   // wildcards disabled. See primitiveEntry
+                );
 
                 // if defined - copy its entries
                 if (ePtr)
diff --git a/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C b/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C
index 02bd8ae0dc..790fac2c8b 100644
--- a/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C
+++ b/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C
@@ -210,7 +210,7 @@ void Foam::pressureGradientExplicitSource::setValue
             (
                 IOobject
                 (
-                    name_ + "::invA",
+                    name_ + ".invA",
                     mesh_.time().timeName(),
                     mesh_,
                     IOobject::NO_READ,
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 6e19f299f0..58c0b57673 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -84,7 +84,6 @@ fvPatchFields = fields/fvPatchFields
 $(fvPatchFields)/fvPatchField/fvPatchFields.C
 
 basicFvPatchFields = $(fvPatchFields)/basic
-$(basicFvPatchFields)/basicSymmetry/basicSymmetryFvPatchFields.C
 $(basicFvPatchFields)/basicSymmetry/basicSymmetryFvPatchScalarField.C
 $(basicFvPatchFields)/calculated/calculatedFvPatchFields.C
 $(basicFvPatchFields)/coupled/coupledFvPatchFields.C
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
index 2e19ff1d2c..c6caad802e 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.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
@@ -58,10 +58,6 @@ class basicSymmetryFvPatchField
 
 public:
 
-    //- Runtime type information
-    TypeName(symmetryFvPatch::typeName_());
-
-
     // Constructors
 
         //- Construct from patch and internal field
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index bdbe5db092..86e2a29e61 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.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
@@ -269,98 +269,98 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     (
         ITstream
         (
-            objectPath() + "::ddtSchemes",
+            objectPath() + ".ddtSchemes",
             tokenList()
         )()
     ),
     defaultDdtScheme_
     (
-        ddtSchemes_.name() + "::default",
+        ddtSchemes_.name() + ".default",
         tokenList()
     ),
     d2dt2Schemes_
     (
         ITstream
         (
-            objectPath() + "::d2dt2Schemes",
+            objectPath() + ".d2dt2Schemes",
             tokenList()
         )()
     ),
     defaultD2dt2Scheme_
     (
-        d2dt2Schemes_.name() + "::default",
+        d2dt2Schemes_.name() + ".default",
         tokenList()
     ),
     interpolationSchemes_
     (
         ITstream
         (
-            objectPath() + "::interpolationSchemes",
+            objectPath() + ".interpolationSchemes",
             tokenList()
         )()
     ),
     defaultInterpolationScheme_
     (
-        interpolationSchemes_.name() + "::default",
+        interpolationSchemes_.name() + ".default",
         tokenList()
     ),
     divSchemes_
     (
         ITstream
         (
-            objectPath() + "::divSchemes",
+            objectPath() + ".divSchemes",
             tokenList()
         )()
     ),
     defaultDivScheme_
     (
-        divSchemes_.name() + "::default",
+        divSchemes_.name() + ".default",
         tokenList()
     ),
     gradSchemes_
     (
         ITstream
         (
-            objectPath() + "::gradSchemes",
+            objectPath() + ".gradSchemes",
             tokenList()
         )()
     ),
     defaultGradScheme_
     (
-        gradSchemes_.name() + "::default",
+        gradSchemes_.name() + ".default",
         tokenList()
     ),
     snGradSchemes_
     (
         ITstream
         (
-            objectPath() + "::snGradSchemes",
+            objectPath() + ".snGradSchemes",
             tokenList()
         )()
     ),
     defaultSnGradScheme_
     (
-        snGradSchemes_.name() + "::default",
+        snGradSchemes_.name() + ".default",
         tokenList()
     ),
     laplacianSchemes_
     (
         ITstream
         (
-            objectPath() + "::laplacianSchemes",
+            objectPath() + ".laplacianSchemes",
             tokenList()
         )()
     ),
     defaultLaplacianScheme_
     (
-        laplacianSchemes_.name() + "::default",
+        laplacianSchemes_.name() + ".default",
         tokenList()
     ),
     fluxRequired_
     (
         ITstream
         (
-            objectPath() + "::fluxRequired",
+            objectPath() + ".fluxRequired",
             tokenList()
         )()
     ),
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
index 7adb5f1688..f3bf760877 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.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
@@ -148,4 +148,39 @@ void Foam::fvc::makeAbsolute
 }
 
 
+Foam::tmp<Foam::surfaceScalarField> Foam::fvc::absolute
+(
+    const tmp<surfaceScalarField>& tphi,
+    const volVectorField& U
+)
+{
+    if (tphi().mesh().moving())
+    {
+        return tphi + fvc::meshPhi(U);
+    }
+    else
+    {
+        return tmp<surfaceScalarField>(tphi, true);
+    }
+}
+
+
+Foam::tmp<Foam::surfaceScalarField> Foam::fvc::absolute
+(
+    const tmp<surfaceScalarField>& tphi,
+    const volScalarField& rho,
+    const volVectorField& U
+)
+{
+    if (tphi().mesh().moving())
+    {
+        return tphi + fvc::meshPhi(rho, U);
+    }
+    else
+    {
+        return tmp<surfaceScalarField>(tphi, true);
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H
index 9dd4d4fad8..4f47c381e3 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.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
@@ -116,6 +116,22 @@ namespace fvc
         const volScalarField& rho,
         const volVectorField& U
     );
+
+
+    //- Return the given relative flux in absolute form
+    tmp<surfaceScalarField> absolute
+    (
+        const tmp<surfaceScalarField>& tphi,
+        const volVectorField& U
+    );
+
+    //- Return the given relative flux in absolute form
+    tmp<surfaceScalarField> absolute
+    (
+        const tmp<surfaceScalarField>& tphi,
+        const volScalarField& rho,
+        const volVectorField& U
+    );
 }
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/MUSCL/MUSCL.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/MUSCL/MUSCL.C
index 2b23afdabd..f58b91238e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/MUSCL/MUSCL.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/MUSCL/MUSCL.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
@@ -54,6 +54,7 @@ namespace Foam
         scalar
     )
 
+/*
     makeLimitedSurfaceInterpolationTypeScheme
     (
         MUSCL,
@@ -71,6 +72,7 @@ namespace Foam
         rhoMagSqr,
         vector
     )
+*/
 }
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index ef332fa673..e9cd4a0ac8 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -346,7 +346,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
         (
             IOobject
             (
-                this->name() + "::UTrans",
+                this->name() + ".UTrans",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::READ_IF_PRESENT,
@@ -362,7 +362,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
         (
             IOobject
             (
-                this->name() + "::UCoeff",
+                this->name() + ".UCoeff",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::READ_IF_PRESENT,
@@ -426,7 +426,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
         (
             IOobject
             (
-                this->name() + "::UTrans",
+                this->name() + ".UTrans",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
@@ -442,7 +442,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
         (
             IOobject
             (
-                name + "::UCoeff",
+                name + ".UCoeff",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 2e793ac71e..e1c4cf4198 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -564,7 +564,7 @@ Foam::KinematicCloud<CloudType>::theta() const
         (
             IOobject
             (
-                this->name() + "::theta",
+                this->name() + ".theta",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
@@ -603,7 +603,7 @@ Foam::KinematicCloud<CloudType>::alpha() const
         (
             IOobject
             (
-                this->name() + "::alpha",
+                this->name() + ".alpha",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
@@ -640,7 +640,7 @@ Foam::KinematicCloud<CloudType>::rhoEff() const
         (
             IOobject
             (
-                this->name() + "::rhoEff",
+                this->name() + ".rhoEff",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 66cb73b85f..bfa1448682 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -107,7 +107,7 @@ inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
                 (
                     IOobject
                     (
-                        this->name() + "::rhoTrans",
+                        this->name() + ".rhoTrans",
                         this->db().time().timeName(),
                         this->db(),
                         IOobject::NO_READ,
@@ -155,7 +155,7 @@ Foam::ReactingCloud<CloudType>::Srho(const label i) const
         (
             IOobject
             (
-                this->name() + "::rhoTrans",
+                this->name() + ".rhoTrans",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
@@ -192,7 +192,7 @@ Foam::ReactingCloud<CloudType>::Srho() const
         (
             IOobject
             (
-                this->name() + "::rhoTrans",
+                this->name() + ".rhoTrans",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
@@ -236,7 +236,7 @@ Foam::ReactingCloud<CloudType>::Srho(volScalarField& rho) const
             (
                 IOobject
                 (
-                    this->name() + "::rhoTrans",
+                    this->name() + ".rhoTrans",
                     this->db().time().timeName(),
                     this->db(),
                     IOobject::NO_READ,
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index c7e5c9814d..b756ad9911 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -64,7 +64,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
             (
                 IOobject
                 (
-                    this->name() + "::radAreaP",
+                    this->name() + ".radAreaP",
                     this->db().time().timeName(),
                     this->db(),
                     IOobject::READ_IF_PRESENT,
@@ -81,7 +81,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
             (
                 IOobject
                 (
-                    this->name() + "::radT4",
+                    this->name() + ".radT4",
                     this->db().time().timeName(),
                     this->db(),
                     IOobject::READ_IF_PRESENT,
@@ -98,7 +98,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
             (
                 IOobject
                 (
-                    this->name() + "::radAreaPT4",
+                    this->name() + ".radAreaPT4",
                     this->db().time().timeName(),
                     this->db(),
                     IOobject::READ_IF_PRESENT,
@@ -169,7 +169,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
         (
             IOobject
             (
-                this->name() + "::hsTrans",
+                this->name() + ".hsTrans",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::READ_IF_PRESENT,
@@ -185,7 +185,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
         (
             IOobject
             (
-                this->name() + "::hsCoeff",
+                this->name() + ".hsCoeff",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::READ_IF_PRESENT,
@@ -239,7 +239,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
         (
             IOobject
             (
-                this->name() + "::hsTrans",
+                this->name() + ".hsTrans",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
@@ -255,7 +255,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
         (
             IOobject
             (
-                this->name() + "::hsCoeff",
+                this->name() + ".hsCoeff",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
@@ -274,7 +274,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
             (
                 IOobject
                 (
-                    this->name() + "::radAreaP",
+                    this->name() + ".radAreaP",
                     this->db().time().timeName(),
                     this->db(),
                     IOobject::NO_READ,
@@ -291,7 +291,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
             (
                 IOobject
                 (
-                    this->name() + "::radT4",
+                    this->name() + ".radT4",
                     this->db().time().timeName(),
                     this->db(),
                     IOobject::NO_READ,
@@ -308,7 +308,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
             (
                 IOobject
                 (
-                    this->name() + "::radAreaPT4",
+                    this->name() + ".radAreaPT4",
                     this->db().time().timeName(),
                     this->db(),
                     IOobject::NO_READ,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 8ffae4f75f..fc4ed0de56 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -46,8 +46,8 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
 {
     if (writeFields_)
     {
-        word massEscapeName(this->owner().name() + "::massEscape");
-        word massStickName(this->owner().name() + "::massStick");
+        word massEscapeName(this->owner().name() + ".massEscape");
+        word massStickName(this->owner().name() + ".massStick");
         Info<< "    Interaction fields will be written to " << massEscapeName
             << " and " << massStickName << endl;
 
@@ -121,7 +121,7 @@ Foam::volScalarField& Foam::LocalInteraction<CloudType>::massEscape()
             (
                 IOobject
                 (
-                    this->owner().name() + "::massEscape",
+                    this->owner().name() + ".massEscape",
                     mesh.time().timeName(),
                     mesh,
                     IOobject::READ_IF_PRESENT,
@@ -150,7 +150,7 @@ Foam::volScalarField& Foam::LocalInteraction<CloudType>::massStick()
             (
                 IOobject
                 (
-                    this->owner().name() + "::massStick",
+                    this->owner().name() + ".massStick",
                     mesh.time().timeName(),
                     mesh,
                     IOobject::READ_IF_PRESENT,
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 26b4fb0187..5fb2d150e6 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.slipFeatureAngle(),
 
         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]
+                        )
+                    );
                 }
             }
         }
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..828ee0e710 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,
@@ -1125,7 +1323,7 @@ Foam::labelPair Foam::autoSnapDriver::findNearFeaturePoint
                 patchConstraints[oldPointI] = pointConstraint();
 
                 label edgeFeatI;
-                const pointIndexHit nearInfo = findNearFeatureEdge
+                findNearFeatureEdge
                 (
                     pp,
                     snapDist,
@@ -1721,7 +1919,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
                             // the old point to attract to nearest edge
                             // instead.
                             label edgeFeatI;
-                            const pointIndexHit nearInfo = findNearFeatureEdge
+                            findNearFeatureEdge
                             (
                                 pp,
                                 snapDist,
@@ -1752,7 +1950,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
                     //    << endl;
 
                     label featI;
-                    const pointIndexHit nearInfo = findNearFeatureEdge
+                    findNearFeatureEdge
                     (
                         pp,
                         snapDist,
@@ -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/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
index cc466df4be..cfc9b3703c 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
@@ -61,6 +61,12 @@ Foam::layerParameters::layerParameters
         readScalar(dict.lookup("minThickness"))
     ),
     featureAngle_(readScalar(dict.lookup("featureAngle"))),
+    slipFeatureAngle_
+    (
+        dict.found("slipFeatureAngle")
+      ? readScalar(dict.lookup("slipFeatureAngle"))
+      : 0.5*featureAngle_
+    ),
     concaveAngle_
     (
         dict.lookupOrDefault("concaveAngle", defaultConcaveAngle)
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
index 4a48784ee9..5298006b04 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
@@ -79,6 +79,8 @@ class layerParameters
 
         scalar featureAngle_;
 
+        scalar slipFeatureAngle_;
+
         scalar concaveAngle_;
 
         label nGrow_;
@@ -178,6 +180,13 @@ public:
                 return featureAngle_;
             }
 
+            //- At non-patched sides allow mesh to slip if extrusion
+            //  direction makes angle larger than slipFeatureAngle.
+            scalar slipFeatureAngle() const
+            {
+                return slipFeatureAngle_;
+            }
+
             scalar concaveAngle() const
             {
                 return concaveAngle_;
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;
                     }
 
diff --git a/src/meshTools/regionSplit/regionSplit.C b/src/meshTools/regionSplit/regionSplit.C
index 77e1ca4346..70b0759c71 100644
--- a/src/meshTools/regionSplit/regionSplit.C
+++ b/src/meshTools/regionSplit/regionSplit.C
@@ -69,7 +69,7 @@ void Foam::regionSplit::transferCoupledFaceRegion
                   "regionSplit::transferCoupledFaceRegion"
                   "(const label, const label, labelList&, labelList&) const"
               )   << "Problem : coupled face " << faceI
-                  << " on patch " << mesh_.boundaryMesh().whichPatch(faceI)
+                  << " on patch " << mesh().boundaryMesh().whichPatch(faceI)
                   << " has region " << faceRegion[faceI]
                   << " but coupled face " << otherFaceI
                   << " has region " << faceRegion[otherFaceI]
@@ -109,7 +109,7 @@ void Foam::regionSplit::fillSeedMask
 
 
     // Collect faces on seed cell
-    const cell& cFaces = mesh_.cells()[seedCellID];
+    const cell& cFaces = mesh().cells()[seedCellID];
 
     label nFaces = 0;
 
@@ -144,7 +144,7 @@ void Foam::regionSplit::fillSeedMask
         {
             label faceI = changedFaces[i];
 
-            label own = mesh_.faceOwner()[faceI];
+            label own = mesh().faceOwner()[faceI];
 
             if (cellRegion[own] == -1)
             {
@@ -152,9 +152,9 @@ void Foam::regionSplit::fillSeedMask
                 changedCells.append(own);
             }
 
-            if (mesh_.isInternalFace(faceI))
+            if (mesh().isInternalFace(faceI))
             {
-                label nei = mesh_.faceNeighbour()[faceI];
+                label nei = mesh().faceNeighbour()[faceI];
 
                 if (cellRegion[nei] == -1)
                 {
@@ -178,7 +178,7 @@ void Foam::regionSplit::fillSeedMask
         {
             label cellI = changedCells[i];
 
-            const cell& cFaces = mesh_.cells()[cellI];
+            const cell& cFaces = mesh().cells()[cellI];
 
             forAll(cFaces, cFaceI)
             {
@@ -203,7 +203,7 @@ void Foam::regionSplit::fillSeedMask
         // Check for changes to any locally coupled face.
         // Global connections are done later.
 
-        const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+        const polyBoundaryMesh& patches = mesh().boundaryMesh();
 
         forAll(patches, patchI)
         {
@@ -274,7 +274,7 @@ Foam::label Foam::regionSplit::calcLocalRegionSplit
         {
             // Check that blockedFace is synced.
             boolList syncBlockedFace(blockedFace);
-            syncTools::swapFaceList(mesh_, syncBlockedFace);
+            syncTools::swapFaceList(mesh(), syncBlockedFace);
 
             forAll(syncBlockedFace, faceI)
             {
@@ -295,7 +295,7 @@ Foam::label Foam::regionSplit::calcLocalRegionSplit
     // Region per face.
     // -1 unassigned
     // -2 blocked
-    labelList faceRegion(mesh_.nFaces(), -1);
+    labelList faceRegion(mesh().nFaces(), -1);
 
     if (blockedFace.size())
     {
@@ -321,7 +321,7 @@ Foam::label Foam::regionSplit::calcLocalRegionSplit
     {
         // Find first unset cell
 
-        for (; unsetCellI < mesh_.nCells(); unsetCellI++)
+        for (; unsetCellI < mesh().nCells(); unsetCellI++)
         {
             if (cellRegion[unsetCellI] == -1)
             {
@@ -329,7 +329,7 @@ Foam::label Foam::regionSplit::calcLocalRegionSplit
             }
         }
 
-        if (unsetCellI >= mesh_.nCells())
+        if (unsetCellI >= mesh().nCells())
         {
             break;
         }
@@ -430,9 +430,9 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
         }
 
 
-        const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+        const polyBoundaryMesh& patches = mesh().boundaryMesh();
 
-        labelList nbrRegion(mesh_.nFaces()-mesh_.nInternalFaces(), -1);
+        labelList nbrRegion(mesh().nFaces()-mesh().nInternalFaces(), -1);
         forAll(patches, patchI)
         {
             const polyPatch& pp = patches[patchI];
@@ -444,7 +444,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
                 (
                     nbrRegion,
                     pp.size(),
-                    pp.start()-mesh_.nInternalFaces()
+                    pp.start()-mesh().nInternalFaces()
                 );
 
                 forAll(patchCells, i)
@@ -457,9 +457,9 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
                 }
             }
         }
-        syncTools::swapBoundaryFaceList(mesh_, nbrRegion);
+        syncTools::swapBoundaryFaceList(mesh(), nbrRegion);
 
-        Map<label> globalToMerged(mesh_.nFaces()-mesh_.nInternalFaces());
+        Map<label> globalToMerged(mesh().nFaces()-mesh().nInternalFaces());
 
         forAll(patches, patchI)
         {
@@ -472,7 +472,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
                 (
                     nbrRegion,
                     pp.size(),
-                    pp.start()-mesh_.nInternalFaces()
+                    pp.start()-mesh().nInternalFaces()
                 );
 
                 forAll(patchCells, i)
@@ -486,7 +486,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
                             //Pout<< "on patch:" << pp.name()
                             //    << " cell:" << patchCells[i]
                             //    << " at:"
-                            // << mesh_.cellCentres()[patchCells[i]]
+                            // << mesh().cellCentres()[patchCells[i]]
                             //    << " was:" << cellRegion[patchCells[i]]
                             //    << " nbr:" << patchNbrRegion[i]
                             //    << endl;
@@ -534,7 +534,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
     // 4a: count. Use a labelHashSet to count regions only once.
     label nCompact = 0;
     {
-        labelHashSet localRegion(mesh_.nFaces()-mesh_.nInternalFaces());
+        labelHashSet localRegion(mesh().nFaces()-mesh().nInternalFaces());
         forAll(cellRegion, cellI)
         {
             if
@@ -692,8 +692,8 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
 
 Foam::regionSplit::regionSplit(const polyMesh& mesh)
 :
-    labelList(mesh.nCells(), -1),
-    mesh_(mesh)
+    MeshObject<polyMesh, regionSplit>(mesh),
+    labelList(mesh.nCells(), -1)
 {
     globalNumberingPtr_ = calcRegionSplit
     (
@@ -710,8 +710,8 @@ Foam::regionSplit::regionSplit
     const boolList& blockedFace
 )
 :
-    labelList(mesh.nCells(), -1),
-    mesh_(mesh)
+    MeshObject<polyMesh, regionSplit>(mesh),
+    labelList(mesh.nCells(), -1)
 {
     globalNumberingPtr_ = calcRegionSplit
     (
@@ -729,8 +729,8 @@ Foam::regionSplit::regionSplit
     const List<labelPair>& explicitConnections
 )
 :
-    labelList(mesh.nCells(), -1),
-    mesh_(mesh)
+    MeshObject<polyMesh, regionSplit>(mesh),
+    labelList(mesh.nCells(), -1)
 {
     globalNumberingPtr_ = calcRegionSplit
     (
diff --git a/src/meshTools/regionSplit/regionSplit.H b/src/meshTools/regionSplit/regionSplit.H
index 83a055a8e0..6c41d1fb83 100644
--- a/src/meshTools/regionSplit/regionSplit.H
+++ b/src/meshTools/regionSplit/regionSplit.H
@@ -98,6 +98,7 @@ SourceFiles
 #include "globalIndex.H"
 #include "labelPair.H"
 #include "boolList.H"
+#include "MeshObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -112,13 +113,11 @@ class polyMesh;
 
 class regionSplit
 :
+    public MeshObject<polyMesh, regionSplit>,
     public labelList
 {
     // Private data
 
-        //- Reference to mesh
-        const polyMesh& mesh_;
-
         mutable autoPtr<globalIndex> globalNumberingPtr_;
 
 
@@ -161,11 +160,13 @@ class regionSplit
             labelList& cellRegion
         ) const;
 
+
 public:
 
     //- Runtime type information
     ClassName("regionSplit");
 
+
     // Constructors
 
         //- Construct from mesh
@@ -185,6 +186,7 @@ public:
             const List<labelPair>&
         );
 
+
     // Member Functions
 
         //- Return global region numbering
@@ -198,7 +200,6 @@ public:
         {
             return globalNumbering().size();
         }
-
 };
 
 
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C
index 74fe73b80c..fd4ba20b65 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C
+++ b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C
@@ -141,7 +141,7 @@ void Foam::turbulenceFields::read(const dictionary& dict)
             Info<< "storing fields:" << nl;
             forAllConstIter(wordHashSet, fieldSet_, iter)
             {
-                Info<< "    " << modelName << "::" << iter.key() << nl;
+                Info<< "    " << modelName << '.' << iter.key() << nl;
             }
             Info<< endl;
         }
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
index 67ac423e1f..bee5824013 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
@@ -36,7 +36,7 @@ void Foam::turbulenceFields::processField
 {
     typedef GeometricField<Type, fvPatchField, volMesh> FieldType;
 
-    const word scopedName = modelName + "::" + fieldName;
+    const word scopedName = modelName + '.' + fieldName;
 
     if (obr_.foundObject<FieldType>(scopedName))
     {
diff --git a/src/randomProcesses/Kmesh/Kmesh.C b/src/randomProcesses/Kmesh/Kmesh.C
index c28db5e1e0..a251459de0 100644
--- a/src/randomProcesses/Kmesh/Kmesh.C
+++ b/src/randomProcesses/Kmesh/Kmesh.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
@@ -30,34 +30,27 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+inline Foam::label Foam::Kmesh::index
+(
+    const label i,
+    const label j,
+    const label k,
+    const labelList& nn
+)
 {
-   //! \cond fileScope
-   inline label rep
-   (
-       const label i,
-       const label j,
-       const label k,
-       const labelList& nn
-   )
-   {
-       return (k + j*nn[2] + i*nn[1]*nn[2]);
-   }
-   //! \endcond
-
-} // End namespace Foam
+    return (k + j*nn[2] + i*nn[1]*nn[2]);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from fvMesh
 Foam::Kmesh::Kmesh(const fvMesh& mesh)
 :
     vectorField(mesh.V().size()),
-    NN(vector::dim)
+    nn_(vector::dim)
 {
     boundBox box = mesh.bounds();
-    L = box.span();
+    l_ = box.span();
 
     vector cornerCellCentre = ::Foam::max(mesh.C().internalField());
     vector cellL = 2*(box.max() - cornerCellCentre);
@@ -65,18 +58,17 @@ Foam::Kmesh::Kmesh(const fvMesh& mesh)
     vector rdeltaByL;
     label nTot = 1;
 
-    label i;
-    forAll(NN, i)
+    forAll(nn_, i)
     {
-        NN[i] = label(L[i]/cellL[i] + 0.5);
-        nTot *= NN[i];
+        nn_[i] = label(l_[i]/cellL[i] + 0.5);
+        nTot *= nn_[i];
 
-        if (NN[i] > 1)
+        if (nn_[i] > 1)
         {
-            L[i] -= cellL[i];
+            l_[i] -= cellL[i];
         }
 
-        rdeltaByL[i] = NN[i]/(L[i]*L[i]);
+        rdeltaByL[i] = nn_[i]/(l_[i]*l_[i]);
     }
 
     if (nTot != mesh.nCells())
@@ -86,24 +78,31 @@ Foam::Kmesh::Kmesh(const fvMesh& mesh)
             << abort(FatalError);
     }
 
-    for (i=0; i<NN[0]; i++)
+    for (label i=0; i<nn_[0]; i++)
     {
-        scalar k1 = (i - NN[0]/2)*constant::mathematical::twoPi/L[0];
+        scalar k1 = (i - nn_[0]/2)*constant::mathematical::twoPi/l_[0];
 
-        for (label j=0; j<NN[1]; j++)
+        for (label j=0; j<nn_[1]; j++)
         {
-            scalar k2 = (j - NN[1]/2)*constant::mathematical::twoPi/L[1];
+            scalar k2 = (j - nn_[1]/2)*constant::mathematical::twoPi/l_[1];
 
-            for (label k=0; k<NN[2]; k++)
+            for (label k=0; k<nn_[2]; k++)
             {
-                scalar k3 = (k - NN[2]/2)*constant::mathematical::twoPi/L[2];
+                scalar k3 = (k - nn_[2]/2)*constant::mathematical::twoPi/l_[2];
 
-                (*this)[rep(i, j, k, NN)] = vector(k1, k2, k3);
+                (*this)[index(i, j, k, nn_)] = vector(k1, k2, k3);
             }
         }
     }
 
-    Kmax = mag((*this)[rep(NN[0]-1, NN[1]-1, NN[2]-1, NN)]);
+    kmax_ = mag
+    (
+        Foam::max
+        (
+            cmptMag((*this)[index(nn_[0]-1, nn_[1]-1, nn_[2]-1, nn_)]),
+            cmptMag((*this)[index(0, 0, 0, nn_)])
+        )
+    );
 }
 
 
diff --git a/src/randomProcesses/Kmesh/Kmesh.H b/src/randomProcesses/Kmesh/Kmesh.H
index de7e6d903a..d09a5894cb 100644
--- a/src/randomProcesses/Kmesh/Kmesh.H
+++ b/src/randomProcesses/Kmesh/Kmesh.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
@@ -51,17 +51,29 @@ class Kmesh
 :
     public vectorField
 {
-
     // Private data
 
         //- Dimensions of box
-        vector L;
+        vector l_;
 
         //- Multi-dimensional addressing array
-        labelList NN;
+        labelList nn_;
 
         //- Maximum wavenumber
-        scalar Kmax;
+        scalar kmax_;
+
+
+    // Private functions
+
+        //- Return the linear index from the i-j-k indices
+        static inline label index
+        (
+            const label i,
+            const label j,
+            const label k,
+            const labelList& nn
+        );
+
 
 public:
 
@@ -77,17 +89,17 @@ public:
 
         const vector& sizeOfBox() const
         {
-            return L;
+            return l_;
         }
 
         const labelList& nn() const
         {
-            return NN;
+            return nn_;
         }
 
         scalar max() const
         {
-            return Kmax;
+            return kmax_;
         }
 };
 
diff --git a/src/regionModels/pyrolysisModels/Make/options b/src/regionModels/pyrolysisModels/Make/options
index eac63d03a0..b922d0f573 100644
--- a/src/regionModels/pyrolysisModels/Make/options
+++ b/src/regionModels/pyrolysisModels/Make/options
@@ -7,6 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
@@ -26,4 +27,5 @@ LIB_LIBS = \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
     -lLESdeltas \
-    -lregionModels
+    -lregionModels \
+    -lradiationModels
diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
index 6f4a438569..c9e20fed75 100644
--- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
+++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
@@ -51,7 +51,8 @@ void noPyrolysis::constructThermoChemistry()
         solidChemistryModel::New(regionMesh()).ptr()
     );
 
-    solidThermo_.reset(&solidChemistry_->solid());
+    solidThermo_.reset(&solidChemistry_->solidThermo());
+    radiation_.reset(radiation::radiationModel::New(solidThermo_->T()).ptr());
 }
 
 bool noPyrolysis::read()
@@ -88,7 +89,8 @@ noPyrolysis::noPyrolysis(const word& modelType, const fvMesh& mesh)
 :
     pyrolysisModel(mesh),
     solidChemistry_(NULL),
-    solidThermo_(NULL)
+    solidThermo_(NULL),
+    radiation_(NULL)
 {
     if (active())
     {
@@ -105,7 +107,8 @@ noPyrolysis::noPyrolysis
 ):
     pyrolysisModel(mesh),
     solidChemistry_(NULL),
-    solidThermo_(NULL)
+    solidThermo_(NULL),
+    radiation_(NULL)
 {
     if (active())
     {
@@ -135,31 +138,31 @@ void noPyrolysis::evolveRegion()
 
 const volScalarField& noPyrolysis::rho() const
 {
-    return (solidThermo_->rho());
+    return solidThermo_->rho();
 }
 
 
 const volScalarField& noPyrolysis::T() const
 {
-    return (solidThermo_->T());
+    return solidThermo_->T();
 }
 
 
 const tmp<volScalarField> noPyrolysis::Cp() const
 {
-    return (solidThermo_->Cp());
+    return solidThermo_->Cp();
 }
 
 
 tmp<volScalarField> noPyrolysis::kappaRad() const
 {
-    return (solidThermo_->kappaRad());
+    return radiation_->absorptionEmission().a();
 }
 
 
 tmp<volScalarField> noPyrolysis::kappa() const
 {
-     return (solidThermo_->kappa());
+     return solidThermo_->kappa();
 }
 
 
diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
index 808b5d7800..87fbd604c7 100644
--- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
+++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
@@ -38,6 +38,7 @@ SourceFiles
 #include "pyrolysisModel.H"
 #include "volFieldsFwd.H"
 #include "solidChemistryModel.H"
+#include "radiationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -86,6 +87,9 @@ protected:
         //- Reference to solid thermo
         autoPtr<solidReactionThermo> solidThermo_;
 
+         //- Pointer to radiation model
+        autoPtr<radiation::radiationModel> radiation_;
+
 
 public:
 
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
index 87294c6096..948d7f87a0 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@@ -363,7 +363,8 @@ reactingOneDim::reactingOneDim(const word& modelType, const fvMesh& mesh)
 :
     pyrolysisModel(modelType, mesh),
     solidChemistry_(solidChemistryModel::New(regionMesh())),
-    solidThermo_(solidChemistry_->solid()),
+    solidThermo_(solidChemistry_->solidThermo()),
+    radiation_(radiation::radiationModel::New(solidThermo_.T())),
     rho_
     (
         IOobject
@@ -474,7 +475,8 @@ reactingOneDim::reactingOneDim
 :
     pyrolysisModel(modelType, mesh, dict),
     solidChemistry_(solidChemistryModel::New(regionMesh())),
-    solidThermo_(solidChemistry_->solid()),
+    solidThermo_(solidChemistry_->solidThermo()),
+    radiation_(radiation::radiationModel::New(solidThermo_.T())),
     rho_
     (
         IOobject
@@ -656,7 +658,7 @@ const tmp<volScalarField> reactingOneDim::Cp() const
 
 tmp<volScalarField> reactingOneDim::kappaRad() const
 {
-    return solidThermo_.kappaRad();
+    return radiation_->absorptionEmission().a();
 }
 
 
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
index 619c9c0e9a..76cf66a60f 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
@@ -37,7 +37,7 @@ SourceFiles
 
 #include "pyrolysisModel.H"
 #include "solidChemistryModel.H"
-
+#include "radiationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -81,6 +81,9 @@ protected:
         //- Reference to solid thermo
         solidReactionThermo& solidThermo_;
 
+        //- Pointer to radiation model
+        autoPtr<radiation::radiationModel> radiation_;
+
 
         // Reference to solid thermo properties
 
@@ -90,7 +93,7 @@ protected:
             //- List of solid components
             PtrList<volScalarField>& Ys_;
 
-            // Non-const access to temperature
+            // Non-const access to enthalpy
             volScalarField& h_;
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
index 2c682e7a60..b122b0b1bd 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.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
@@ -82,7 +82,7 @@ tmp<volScalarField> noRadiation::Shs()
         (
             IOobject
             (
-                typeName + "::Shs",
+                typeName + ".Shs",
                 owner().time().timeName(),
                 owner().regionMesh(),
                 IOobject::NO_READ,
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
index 6f20f0266a..be5460757f 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.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,7 +115,7 @@ tmp<volScalarField> standardRadiation::Shs()
         (
             IOobject
             (
-                typeName + "::Shs",
+                typeName + ".Shs",
                 owner().time().timeName(),
                 owner().regionMesh(),
                 IOobject::NO_READ,
diff --git a/src/regionModels/thermoBaffleModels/Make/options b/src/regionModels/thermoBaffleModels/Make/options
index 8d14c45c93..7e40068412 100644
--- a/src/regionModels/thermoBaffleModels/Make/options
+++ b/src/regionModels/thermoBaffleModels/Make/options
@@ -8,6 +8,7 @@ EXE_INC = \
     -I$(LIB_SRC)/AMIInterpolation/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude
 
 LIB_LIBS = \
@@ -17,4 +18,5 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lOpenFOAM \
-    -lsolidSpecie
+    -lsolidSpecie \
+    -lradiationModels
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/noThermo/noThermo.C b/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
index aabcfd204b..1175a0d792 100644
--- a/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
+++ b/src/regionModels/thermoBaffleModels/noThermo/noThermo.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
@@ -88,7 +88,8 @@ void noThermo::evolveRegion()
 const tmp<volScalarField> noThermo::Cp() const
 {
     FatalErrorIn("const tmp<volScalarField>& noThermo::Cp() const")
-        << "Cp field not available for " << type() << abort(FatalError);
+        << "Cp field not available for " << type()
+        << abort(FatalError);
 
     return tmp<volScalarField>
     (
@@ -112,7 +113,8 @@ const tmp<volScalarField> noThermo::Cp() const
 const volScalarField& noThermo::kappaRad() const
 {
     FatalErrorIn("const volScalarField& noThermo::kappaRad() const")
-        << "kappa field not available for " << type() << abort(FatalError);
+        << "kappa field not available for " << type()
+        << abort(FatalError);
     return volScalarField::null();
 }
 
@@ -120,7 +122,8 @@ const volScalarField& noThermo::kappaRad() const
 const volScalarField& noThermo::rho() const
 {
     FatalErrorIn("const volScalarField& noThermo::rho() const")
-        << "rho field not available for " << type() << abort(FatalError);
+        << "rho field not available for " << type()
+        << abort(FatalError);
     return volScalarField::null();
 }
 
@@ -128,7 +131,8 @@ const volScalarField& noThermo::rho() const
 const volScalarField& noThermo::kappa() const
 {
    FatalErrorIn("const volScalarField& noThermo::kappa() const")
-        << "K field not available for " << type() << abort(FatalError);
+        << "K field not available for " << type()
+        << abort(FatalError);
     return volScalarField::null();
 }
 
@@ -136,7 +140,8 @@ const volScalarField& noThermo::kappa() const
 const volScalarField& noThermo::T() const
 {
     FatalErrorIn("const volScalarField& noThermo::T() const")
-        << "T field not available for " << type() << abort(FatalError);
+        << "T field not available for " << type()
+        << abort(FatalError);
     return volScalarField::null();
 }
 
@@ -144,7 +149,8 @@ const volScalarField& noThermo::T() const
 const solidThermo& noThermo::thermo() const
 {
     FatalErrorIn("const volScalarField& noThermo::T() const")
-        << "T field not available for " << type() << abort(FatalError);
+        << "T field not available for " << type()
+        << abort(FatalError);
     return reinterpret_cast<const solidThermo&>(null);
 }
 
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
index 97faec40cb..124f4789b0 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
@@ -318,7 +318,7 @@ const tmp<volScalarField> thermoBaffle2D::Cp() const
 
 const volScalarField& thermoBaffle2D::kappaRad() const
 {
-    return thermo_->kappaRad();
+    return radiation_->absorptionEmission().a();
 }
 
 
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.C b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.C
index 8217c9b1f5..3b2c2bcb9c 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.C
+++ b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.C
@@ -192,6 +192,9 @@ void thermoBaffleModel::init()
                 }
             }
         }
+
+        // Create radiation model
+        radiation_.reset(radiation::radiationModel::New(T()).ptr());
     }
 }
 
@@ -204,7 +207,8 @@ thermoBaffleModel::thermoBaffleModel(const fvMesh& mesh)
     thickness_(),
     delta_("delta", dimLength, 0.0),
     oneD_(false),
-    constantThickness_(true)
+    constantThickness_(true),
+    radiation_(NULL)
 {}
 
 
@@ -220,7 +224,8 @@ thermoBaffleModel::thermoBaffleModel
     thickness_(),
     delta_("delta", dimLength, 0.0),
     oneD_(false),
-    constantThickness_(dict.lookupOrDefault<bool>("constantThickness", true))
+    constantThickness_(dict.lookupOrDefault<bool>("constantThickness", true)),
+    radiation_(NULL)
 {
     init();
 }
@@ -232,7 +237,8 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
     thickness_(),
     delta_("delta", dimLength, 0.0),
     oneD_(false),
-    constantThickness_(lookupOrDefault<bool>("constantThickness", true))
+    constantThickness_(lookupOrDefault<bool>("constantThickness", true)),
+    radiation_(NULL)
 {
     init();
 }
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H
index 9160c32e80..e9f461391f 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H
+++ b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H
@@ -40,6 +40,8 @@ SourceFiles
 #include "volFieldsFwd.H"
 #include "solidThermo.H"
 #include "regionModel1D.H"
+#include "radiationModel.H"
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -88,6 +90,9 @@ protected:
         //- Is thickness constant
         bool constantThickness_;
 
+        //- Pointer to radiation model
+        autoPtr<radiation::radiationModel> radiation_;
+
 
     // Protected Member Functions
 
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..06c9b47697 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,20 @@ 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 +138,8 @@ 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/basicChemistryModel/basicChemistryModelTemplates.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
index e842b4b27b..7e20960210 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);
@@ -160,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
     {
@@ -183,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/ODEChemistryModel/ODEChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
similarity index 91%
rename from src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
rename to src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index 522afe5161..226e19c226 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -23,26 +23,20 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "ODEChemistryModel.H"
-#include "chemistrySolver.H"
+#include "chemistryModel.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,
-    const word& thermoTypeName
+    const fvMesh& mesh
 )
 :
-    CompType(mesh, thermoTypeName),
-
+    CompType(mesh),
     ODE(),
-
     Y_(this->thermo().composition().Y()),
-
     reactions_
     (
         dynamic_cast<const reactingMixture<ThermoType>&>(this->thermo())
@@ -68,7 +62,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::ODEChemistryModel
             (
                 IOobject
                 (
-                    "RR::" + Y_[fieldI].name(),
+                    "RR." + Y_[fieldI].name(),
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -80,7 +74,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::ODEChemistryModel
         );
     }
 
-    Info<< "ODEChemistryModel: Number of species = " << nSpecie_
+    Info<< "chemistryModel: Number of species = " << nSpecie_
         << " and reactions = " << nReaction_ << endl;
 }
 
@@ -88,7 +82,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::ODEChemistryModel
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class CompType, class ThermoType>
-Foam::ODEChemistryModel<CompType, ThermoType>::~ODEChemistryModel()
+Foam::chemistryModel<CompType, ThermoType>::~chemistryModel()
 {}
 
 
@@ -96,7 +90,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 +132,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 +154,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 +183,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 +214,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 +332,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 +383,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 +526,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;
@@ -570,6 +564,8 @@ Foam::ODEChemistryModel<CompType, ThermoType>::tc() const
     );
 
     scalarField& tc = ttc();
+    const scalarField& T = this->thermo().T();
+    const scalarField& p = this->thermo().p();
 
     const label nReaction = reactions_.size();
 
@@ -578,8 +574,8 @@ Foam::ODEChemistryModel<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;
 
@@ -615,7 +611,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 +653,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 +685,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 +693,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_)
     {
@@ -718,11 +714,14 @@ void Foam::ODEChemistryModel<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++)
@@ -742,7 +741,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
@@ -773,13 +772,16 @@ Foam::scalar Foam::ODEChemistryModel<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);
@@ -833,7 +835,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 +846,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 91%
rename from src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H
rename to src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
index da560dae87..b663769d2a 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,22 +104,17 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("ODEChemistryModel");
+    TypeName("chemistryModel");
 
 
     // Constructors
 
-        //- Construct from components
-        ODEChemistryModel
-        (
-            const fvMesh& mesh,
-            const word& ODEModelName,
-            const word& thermoTypeName
-        );
+        //- Construct from mesh
+        chemistryModel(const fvMesh& mesh);
 
 
     //- Destructor
-    virtual ~ODEChemistryModel();
+    virtual ~chemistryModel();
 
 
     // Member Functions
@@ -263,12 +258,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.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
index 933dd952ba..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,12 +34,12 @@ namespace Foam
     defineRunTimeSelectionTable(psiChemistryModel, fvMesh);
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 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 0a269a3ce4..d214a6912a 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
@@ -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/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.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
index f8b033d68a..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,12 +34,12 @@ namespace Foam
     defineRunTimeSelectionTable(rhoChemistryModel, fvMesh);
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 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 1e36ee19e4..94c66733e3 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
@@ -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/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/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 dfbb29ecd0..574a808383 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
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef chemistrySolver_H
 #define chemistrySolver_H
 
-#include "ODEChemistryModel.H"
+#include "chemistryModel.H"
 #include "IOdictionary.H"
 #include "scalarField.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/chemistrySolver/makeChemistrySolverTypes.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
index f9ab5839c3..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
@@ -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/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 7e2b44bc83..aff5be67ca 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
@@ -24,19 +24,17 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ode.H"
-#include "ODEChemistryModel.H"
+#include "chemistryModel.H"
 
 // * * * * * * * * * * * * * * * * 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/radiationModels/Make/files b/src/thermophysicalModels/radiationModels/Make/files
index 9822712105..9e49da1fde 100644
--- a/src/thermophysicalModels/radiationModels/Make/files
+++ b/src/thermophysicalModels/radiationModels/Make/files
@@ -8,6 +8,7 @@ radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
 radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C
 radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C
 radiationModel/viewFactor/viewFactor.C
+radiationModel/opaqueSolid/opaqueSolid.C
 
 /* Scatter model */
 submodels/scatterModel/scatterModel/scatterModel.C
@@ -23,6 +24,7 @@ submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionE
 submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C
 submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
 submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
 
 
 /* Boundary conditions */
diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
index aaa301f345..bfc266ab73 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
@@ -29,7 +29,7 @@ License
 
 #include "mappedPatchBase.H"
 #include "fvPatchFieldMapper.H"
-#include "solidThermo.H"
+#include "radiationModel.H"
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
@@ -42,7 +42,7 @@ namespace Foam
         2
     >::names[] =
     {
-        "solidThermo",
+        "solidRadiation",
         "lookup"
     };
 }
@@ -78,7 +78,7 @@ Foam::radiationCoupledBase::radiationCoupledBase
 {
     switch (method_)
     {
-        case SOLIDTHERMO:
+        case SOLIDRADIATION:
         {
             if (!isA<mappedPatchBase>(patch_.patch()))
             {
@@ -132,7 +132,7 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const
 {
     switch (method_)
     {
-        case SOLIDTHERMO:
+        case SOLIDRADIATION:
         {
             // Get the coupling information from the mappedPatchBase
             const mappedPatchBase& mpp =
@@ -143,12 +143,13 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const
 
             const polyMesh& nbrMesh = mpp.sampleMesh();
 
-            const solidThermo& thermo =
-                nbrMesh.lookupObject<solidThermo>
+            const radiation::radiationModel& radiation =
+                nbrMesh.lookupObject<radiation::radiationModel>
                 (
-                    "thermophysicalProperties"
+                    "radiationProperties"
                 );
 
+
             // Force recalculation of mapping and schedule
             const mapDistribute& distMap = mpp.map();
 
@@ -157,7 +158,14 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const
                 nbrMesh
             ).boundary()[mpp.samplePolyPatch().index()];
 
-            scalarField emissivity(thermo.emissivity(nbrPatch.index()));
+
+            scalarField emissivity
+            (
+                radiation.absorptionEmission().e()().boundaryField()
+                [
+                    nbrPatch.index()
+                ]
+            );
             distMap.distribute(emissivity);
 
             return emissivity;
@@ -176,8 +184,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 +192,7 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const
         }
         break;
     }
+
     return scalarField(0);
 }
 
diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
index 01d8e8761c..12d805c078 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
@@ -59,7 +59,7 @@ public:
     //- Type of supplied emissivity
     enum emissivityMethodType
     {
-        SOLIDTHERMO,
+        SOLIDRADIATION,
         LOOKUP
     };
 
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/opaqueSolid/opaqueSolid.C b/src/thermophysicalModels/radiationModels/radiationModel/opaqueSolid/opaqueSolid.C
new file mode 100644
index 0000000000..b4396573c6
--- /dev/null
+++ b/src/thermophysicalModels/radiationModels/radiationModel/opaqueSolid/opaqueSolid.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "opaqueSolid.H"
+#include "addToRunTimeSelectionTable.H"
+#include "physicoChemicalConstants.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace radiation
+    {
+        defineTypeNameAndDebug(opaqueSolid, 0);
+
+        addToRunTimeSelectionTable
+        (
+            radiationModel,
+            opaqueSolid,
+            dictionary
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::radiation::opaqueSolid::opaqueSolid
+(
+    const volScalarField& T
+)
+:
+    radiationModel(typeName, T)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::radiation::opaqueSolid::~opaqueSolid()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::radiation::opaqueSolid::read()
+{
+    return radiationModel::read();
+}
+
+
+void Foam::radiation::opaqueSolid::calculate()
+{
+    // Do nothing
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::radiation::opaqueSolid::Rp() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Rp",
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar
+            (
+                "Rp",
+                constant::physicoChemical::sigma.dimensions()/dimLength,
+                0.0
+            )
+        )
+    );
+}
+
+
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::radiation::opaqueSolid::Ru() const
+{
+    return tmp<DimensionedField<scalar, volMesh> >
+    (
+        new DimensionedField<scalar, volMesh>
+        (
+            IOobject
+            (
+                "Ru",
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar
+            (
+                "Ru", dimMass/dimLength/pow3(dimTime), 0.0
+            )
+        )
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.H b/src/thermophysicalModels/radiationModels/radiationModel/opaqueSolid/opaqueSolid.H
similarity index 59%
rename from src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.H
rename to src/thermophysicalModels/radiationModels/radiationModel/opaqueSolid/opaqueSolid.H
index ab7ef09117..d50e6f6795 100644
--- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.H
+++ b/src/thermophysicalModels/radiationModels/radiationModel/opaqueSolid/opaqueSolid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,79 +22,88 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::heRhoReactionThermo
+    Foam::radiation::opaqueSolid
 
 Description
-    Foam::heRhoReactionThermo
+    Radiation for solid opaque solids - does nothing to energy equation source
+    terms (returns zeros) but creates absorptionEmissionModel and
+    scatterModel.
 
 SourceFiles
-    heRhoReactionThermo.C
+    opaqueSolid.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef heRhoReactionThermo_H
-#define heRhoReactionThermo_H
+#ifndef opaqueSolid_H
+#define opaqueSolid_H
 
-#include "heThermo.H"
-#include "rhoReactionThermo.H"
+#include "radiationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+namespace radiation
+{
 
 /*---------------------------------------------------------------------------*\
-                      Class heRhoReactionThermo Declaration
+                             Class opaqueSolid Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class MixtureType>
-class heRhoReactionThermo
+class opaqueSolid
 :
-    public heThermo<rhoReactionThermo, MixtureType>
+    public radiationModel
 {
     // Private Member Functions
 
-        void calculate();
+        //- Disallow default bitwise copy construct
+        opaqueSolid(const opaqueSolid&);
 
-        //- Construct as copy (not implemented)
-        heRhoReactionThermo(const heRhoReactionThermo<MixtureType>&);
+        //- Disallow default bitwise assignment
+        void operator=(const opaqueSolid&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("heRhoReactionThermo");
+    TypeName("opaqueSolid");
 
 
     // Constructors
 
-        //- Construct from mesh
-        heRhoReactionThermo(const fvMesh&);
+        //- Construct from components
+        opaqueSolid(const volScalarField& T);
 
 
     //- Destructor
-    virtual ~heRhoReactionThermo();
+    virtual ~opaqueSolid();
 
 
     // Member functions
 
-        //- Update properties
-        virtual void correct();
+        // Edit
+
+            //- Solve radiation equation(s)
+            void calculate();
+
+            //- Read radiationProperties dictionary
+            bool read();
+
+            //- Source term component (for power of T^4)
+            tmp<volScalarField> Rp() const;
+
+            //- Source term component (constant)
+            tmp<DimensionedField<scalar, volMesh> > Ru() const;
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace radiation
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-#   include "heRhoReactionThermo.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C
index 1664d8edd1..6a20fbcf5c 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C
@@ -89,7 +89,7 @@ Foam::radiation::radiationModel::radiationModel
     T_(T),
     radiation_(lookup("radiation")),
     coeffs_(subDict(type + "Coeffs")),
-    solverFreq_(readLabel(lookup("solverFreq"))),
+    solverFreq_(lookupOrDefault<label>("solverFreq", 1)),
     firstIter_(true),
     absorptionEmission_(absorptionEmissionModel::New(*this, mesh_)),
     scatter_(scatterModel::New(*this, mesh_))
@@ -113,7 +113,7 @@ bool Foam::radiation::radiationModel::read()
         lookup("radiation") >> radiation_;
         coeffs_ = subDict(type() + "Coeffs");
 
-        lookup("solverFreq") >> solverFreq_,
+        solverFreq_ = lookupOrDefault<label>("solverFreq", 1);
         solverFreq_ = max(1, solverFreq_);
 
         return true;
@@ -158,4 +158,11 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::radiation::radiationModel::Sh
 }
 
 
+const Foam::radiation::absorptionEmissionModel&
+Foam::radiation::radiationModel::absorptionEmission() const
+{
+    return absorptionEmission_();
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H
index b9963f0f70..e8aa9f5778 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H
+++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H
@@ -48,6 +48,7 @@ SourceFiles
 #include "fluidThermo.H"
 #include "fvMatrices.H"
 #include "blackBodyEmission.H"
+#include "absorptionEmissionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,7 +58,6 @@ namespace radiation
 {
 
 // Forward declaration of classes
-class absorptionEmissionModel;
 class scatterModel;
 
 /*---------------------------------------------------------------------------*\
@@ -178,6 +178,9 @@ public:
 
             //- Energy source term
             virtual tmp<fvScalarMatrix> Sh(fluidThermo& thermo) const;
+
+            //- Access to absorptionEmissionModel
+            const absorptionEmissionModel& absorptionEmission() const;
 };
 
 
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
index 25c7cb156f..ec6b42bf17 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
@@ -54,8 +54,8 @@ Foam::radiation::constantAbsorptionEmission::constantAbsorptionEmission
 :
     absorptionEmissionModel(dict, mesh),
     coeffsDict_(dict.subDict(typeName + "Coeffs")),
-    a_(coeffsDict_.lookup("a")),
-    e_(coeffsDict_.lookup("e")),
+    a_(coeffsDict_.lookup("absorptivity")),
+    e_(coeffsDict_.lookup("emissivity")),
     E_(coeffsDict_.lookup("E"))
 {}
 
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
new file mode 100644
index 0000000000..1d2c76d036
--- /dev/null
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@@ -0,0 +1,198 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "greyMeanSolidAbsorptionEmission.H"
+#include "addToRunTimeSelectionTable.H"
+#include "unitConversion.H"
+#include "zeroGradientFvPatchFields.H"
+#include "basicSolidMixture.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace radiation
+    {
+        defineTypeNameAndDebug(greyMeanSolidAbsorptionEmission, 0);
+
+        addToRunTimeSelectionTable
+        (
+            absorptionEmissionModel,
+            greyMeanSolidAbsorptionEmission,
+            dictionary
+        );
+    }
+}
+
+// * * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * //
+
+Foam::tmp<Foam::scalarField> Foam::radiation::
+greyMeanSolidAbsorptionEmission::X(const word specie) const
+{
+    const volScalarField& T = thermo_.T();
+    const volScalarField& p = thermo_.p();
+
+    tmp<scalarField> tXj(new scalarField(T.internalField().size(), 0.0));
+    scalarField& Xj = tXj();
+
+    tmp<scalarField> tRhoInv(new scalarField(T.internalField().size(), 0.0));
+    scalarField& rhoInv = tRhoInv();
+
+    forAll(mixture_.Y(), specieI)
+    {
+        const scalarField& Yi = mixture_.Y()[specieI];
+
+        forAll (rhoInv, iCell)
+        {
+            rhoInv[iCell] +=
+                Yi[iCell]/mixture_.rho(specieI, p[iCell], T[iCell]);
+        }
+    }
+    const scalarField& Yj = mixture_.Y(specie);
+    const label mySpecieI = mixture_.components()[specie];
+    forAll(Xj, iCell)
+    {
+        Xj[iCell] = Yj[iCell]/mixture_.rho(mySpecieI, p[iCell], T[iCell]);
+    }
+
+    return (Xj/rhoInv);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::radiation::greyMeanSolidAbsorptionEmission::
+greyMeanSolidAbsorptionEmission
+(
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    absorptionEmissionModel(dict, mesh),
+    coeffsDict_((dict.subDict(typeName + "Coeffs"))),
+    thermo_(mesh.lookupObject<solidThermo>("thermophysicalProperties")),
+    speciesNames_(0),
+    mixture_(dynamic_cast<const basicSolidMixture&>(thermo_)),
+    solidData_(mixture_.Y().size())
+{
+    if (!isA<basicSolidMixture>(thermo_))
+    {
+        FatalErrorIn
+        (
+            "radiation::greyMeanSolidAbsorptionEmission::"
+            "greyMeanSolidAbsorptionEmission"
+            "("
+                "const dictionary&, "
+                "const fvMesh&"
+            ")"
+        )   << "Model requires a multi-component thermo package"
+            << abort(FatalError);
+    }
+
+    label nFunc = 0;
+    const dictionary& functionDicts = dict.subDict(typeName + "Coeffs");
+
+    forAllConstIter(dictionary, functionDicts, iter)
+    {
+        // safety:
+        if (!iter().isDict())
+        {
+            continue;
+        }
+        const word& key = iter().keyword();
+        speciesNames_.insert(key, nFunc);
+        const dictionary& dict = iter().dict();
+        dict.lookup("absorptivity") >> solidData_[nFunc][absorptivity];
+        dict.lookup("emissivity") >> solidData_[nFunc][emissivity];
+
+        nFunc++;
+    }
+}
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::radiation::greyMeanSolidAbsorptionEmission::
+~greyMeanSolidAbsorptionEmission()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::radiation::greyMeanSolidAbsorptionEmission::
+calc(const label propertyId) const
+{
+    tmp<volScalarField> ta
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "a",
+                mesh().time().timeName(),
+                mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh(),
+            dimensionedScalar("a", dimless/dimLength, 0.0),
+            zeroGradientFvPatchVectorField::typeName
+        )
+    );
+
+    scalarField& a = ta().internalField();
+
+    forAllConstIter(HashTable<label>, speciesNames_, iter)
+    {
+        if (mixture_.contains(iter.key()))
+        {
+            a += solidData_[iter()][propertyId]*X(iter.key());
+        }
+    }
+
+    ta().correctBoundaryConditions();
+    return ta;
+}
+
+
+Foam::tmp<Foam::volScalarField>
+Foam::radiation::greyMeanSolidAbsorptionEmission::eCont
+(
+    const label bandI
+) const
+{
+   return calc(emissivity);
+}
+
+
+Foam::tmp<Foam::volScalarField>
+Foam::radiation::greyMeanSolidAbsorptionEmission::aCont
+(
+    const label bandI
+) const
+{
+   return calc(absorptivity);
+}
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H
new file mode 100644
index 0000000000..3eed717f21
--- /dev/null
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H
@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::radiation::greyMeanSolidAbsorptionEmission
+
+Description
+    greyMeanSolidAbsorptionEmission radiation absorption and emission
+    coefficients for continuous phase
+
+    The coefficients for the species in the Look up table have to be specified
+    for use in moles x P [atm], i.e. (k[i] = species[i]*p*9.869231e-6).
+
+    The coefficients for CO and soot or any other added are multiplied by the
+    respective mass fraction being solved
+
+    All the species in the dictionary need either to be in the look-up table or
+    being solved. Conversely, all the species solved do not need to be included
+    in the calculation of the absorption coefficient
+
+    The names of the species in the absorption dictionary must match exactly the
+    name in the look-up table or the name of the field being solved
+
+SourceFiles
+    greyMeanSolidAbsorptionEmission.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef greyMeanSolidAbsorptionEmission_H
+#define greyMeanSolidAbsorptionEmission_H
+
+#include "absorptionEmissionModel.H"
+#include "solidThermo.H"
+#include "basicMultiComponentMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace radiation
+{
+
+/*---------------------------------------------------------------------------*\
+                 Class greyMeanSolidAbsorptionEmission Declaration
+\*---------------------------------------------------------------------------*/
+
+class greyMeanSolidAbsorptionEmission
+:
+    public absorptionEmissionModel
+{
+
+private:
+
+    // Private data
+
+        //- Enumering of radiative properties
+        enum radiativeProperties
+        {
+            absorptivity,
+            emissivity
+        };
+
+        //- Absorption model dictionary
+        dictionary coeffsDict_;
+
+        //- SLG thermo package
+        const solidThermo& thermo_;
+
+        //- Hash table of species names
+        HashTable<label> speciesNames_;
+
+        //- Basic multicomponent mixture
+        const basicSolidMixture& mixture_;
+
+        //- List of solid species data
+        List<FixedList<scalar, 2> > solidData_;
+
+
+    // Private member functions
+
+       //- Calculate the volumetric fraction of Yj
+       tmp<scalarField> X(const word specie) const;
+
+       //- Calculate the property mixing
+       tmp<volScalarField> calc(const label) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("greyMeanSolidAbsorptionEmission");
+
+
+    // Constructors
+
+        //- Construct from components
+        greyMeanSolidAbsorptionEmission
+        (
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+
+    //- Destructor
+    virtual ~greyMeanSolidAbsorptionEmission();
+
+
+    // Member Operators
+
+        // Access
+
+            // Absorption coefficient
+
+                //- Absorption coefficient for continuous phase
+                tmp<volScalarField> aCont(const label bandI = 0) const;
+
+
+            // Emission coefficient
+
+                //- Emission coefficient for continuous phase
+                tmp<volScalarField> eCont(const label bandI = 0) const;
+
+
+    // Member Functions
+
+        inline bool isGrey() const
+        {
+            return true;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace radiation
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
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..d662b4518f 100644
--- a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
@@ -35,6 +35,7 @@ License
                                                                                \
 typedef MixtureThermo                                                          \
 <                                                                              \
+    CThermo,                                                                   \
     SpecieMixture                                                              \
     <                                                                          \
         Mixture                                                                \
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C
index 4cdec064bf..938244b592 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C
@@ -207,4 +207,16 @@ Foam::scalar Foam::SpecieMixture<MixtureType>::alphah
 }
 
 
+template<class MixtureType>
+Foam::scalar Foam::SpecieMixture<MixtureType>::rho
+(
+    const label speciei,
+    const scalar p,
+    const scalar T
+) const
+{
+    return this->getLocalThermo(speciei).rho(p, T);
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
index ed237ef446..a954119dac 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
@@ -176,6 +176,14 @@ public:
                 const scalar p,
                 const scalar T
             ) const;
+
+            //- Density [kg/m3]
+            virtual scalar rho
+            (
+                const label specieI,
+                const scalar p,
+                const scalar T
+            ) const;
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
index 80a9e7f056..ea712fc22f 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
@@ -227,6 +227,14 @@ public:
                 const scalar p,
                 const scalar T
             ) const = 0;
+
+            //- Density [kg/m3]
+            virtual scalar rho
+            (
+                const label specieI,
+                const scalar p,
+                const scalar T
+            ) const = 0;
 };
 
 
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 89%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.C
rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
index b0705c3261..8a2daccfe6 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,11 @@ 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 +191,20 @@ 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 +214,15 @@ 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 +241,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 +263,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 +319,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 +370,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 +422,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 +477,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 76%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C
rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C
index f5c65f483d..49c462d383 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"
@@ -33,11 +33,13 @@ License
 #include "perfectGas.H"
 #include "hConstThermo.H"
 #include "janafThermo.H"
-#include "absoluteEnthalpy.H"
 #include "thermo.H"
 #include "constTransport.H"
 #include "sutherlandTransport.H"
 
+#include "absoluteEnthalpy.H"
+#include "absoluteInternalEnergy.H"
+
 #include "homogeneousMixture.H"
 #include "inhomogeneousMixture.H"
 #include "veryInhomogeneousMixture.H"
@@ -56,7 +58,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     homogeneousMixture,
     constTransport,
     absoluteEnthalpy,
@@ -69,7 +71,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     inhomogeneousMixture,
     constTransport,
     absoluteEnthalpy,
@@ -82,7 +84,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     veryInhomogeneousMixture,
     constTransport,
     absoluteEnthalpy,
@@ -95,7 +97,21 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
+    egrMixture,
+    constTransport,
+    absoluteEnthalpy,
+    hConstThermo,
+    perfectGas,
+    specie
+);
+
+
+makeReactionThermo
+(
+    psiThermo,
+    psiuReactionThermo,
+    heheuPsiThermo,
     homogeneousMixture,
     sutherlandTransport,
     absoluteEnthalpy,
@@ -108,7 +124,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     inhomogeneousMixture,
     sutherlandTransport,
     absoluteEnthalpy,
@@ -121,7 +137,7 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     veryInhomogeneousMixture,
     sutherlandTransport,
     absoluteEnthalpy,
@@ -134,11 +150,25 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
     egrMixture,
-    constTransport,
+    sutherlandTransport,
     absoluteEnthalpy,
-    hConstThermo,
+    janafThermo,
+    perfectGas,
+    specie
+);
+
+
+makeReactionThermo
+(
+    psiThermo,
+    psiuReactionThermo,
+    heheuPsiThermo,
+    homogeneousMixture,
+    sutherlandTransport,
+    absoluteInternalEnergy,
+    janafThermo,
     perfectGas,
     specie
 );
@@ -147,10 +177,36 @@ makeReactionThermo
 (
     psiThermo,
     psiuReactionThermo,
-    heheuReactionThermo,
+    heheuPsiThermo,
+    inhomogeneousMixture,
+    sutherlandTransport,
+    absoluteInternalEnergy,
+    janafThermo,
+    perfectGas,
+    specie
+);
+
+makeReactionThermo
+(
+    psiThermo,
+    psiuReactionThermo,
+    heheuPsiThermo,
+    veryInhomogeneousMixture,
+    sutherlandTransport,
+    absoluteInternalEnergy,
+    janafThermo,
+    perfectGas,
+    specie
+);
+
+makeReactionThermo
+(
+    psiThermo,
+    psiuReactionThermo,
+    heheuPsiThermo,
     egrMixture,
     sutherlandTransport,
-    absoluteEnthalpy,
+    absoluteInternalEnergy,
     janafThermo,
     perfectGas,
     specie
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/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/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
index 23ad0e62a0..6bc25ebc2c 100644
--- a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
@@ -32,27 +32,30 @@ 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()),
+    Ys_(this->solidThermo().composition().Y()),
     pyrolisisGases_
     (
         mesh.lookupObject<dictionary>
-            ("chemistryProperties").lookup("species")
+            ("thermophysicalProperties").lookup("gaseousSpecies")
     ),
     reactions_
     (
-        dynamic_cast<const reactingSolidMixture<SolidThermo>& >(this->solid())
+        dynamic_cast<const reactingSolidMixture<SolidThermo>& >
+        (
+            this->solidThermo()
+        )
     ),
     solidThermo_
     (
         dynamic_cast<const reactingSolidMixture<SolidThermo>& >
-            (this->solid()).solidData()
+        (
+            this->solidThermo()
+        ).solidData()
     ),
     gasThermo_(pyrolisisGases_.size()),
     nGases_(pyrolisisGases_.size()),
@@ -75,7 +78,7 @@ ODESolidChemistryModel
             (
                 IOobject
                 (
-                    "RRs::" + Ys_[fieldI].name(),
+                    "RRs." + Ys_[fieldI].name(),
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -149,7 +152,7 @@ ODESolidChemistryModel
 
             // Calculate inital values of Ysi0 = rho*delta*Yi
             Ys0_[fieldI].internalField() =
-                this->solid().rho()
+                this->solidThermo().rho()
                *max(Ys_[fieldI], scalar(0.001))*mesh.V();
         }
    }
@@ -163,7 +166,7 @@ ODESolidChemistryModel
             (
                 IOobject
                 (
-                    "RRg::" + pyrolisisGases_[fieldI],
+                    "RRg." + pyrolisisGases_[fieldI],
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -180,8 +183,8 @@ ODESolidChemistryModel
         dictionary thermoDict =
             mesh.lookupObject<dictionary>
             (
-                "chemistryProperties"
-            ).subDict(pyrolisisGases_[gasI]);
+                "thermophysicalProperties"
+            ).subDict(pyrolisisGases_[gasI] + "Coeffs");
 
         gasThermo_.set
         (
@@ -566,7 +569,7 @@ void Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::calculate()
             IOobject::NO_WRITE,
             false
         ),
-        this->solid().rho()
+        this->solidThermo().rho()
     );
 
     forAll(RRs_, i)
@@ -587,8 +590,8 @@ void Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::calculate()
         if (reactingCells_[celli])
         {
             scalar rhoi = rho[celli];
-            scalar Ti = this->solid().T()[celli];
-            scalar pi = this->solid().p()[celli];
+            scalar Ti = this->solidThermo().T()[celli];
+            scalar pi = this->solidThermo().p()[celli];
 
             scalarField c(nSpecie_, 0.0);
             for (label i=0; i<nSolids_; i++)
@@ -638,7 +641,7 @@ Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::solve
             IOobject::NO_WRITE,
             false
         ),
-        this->solid().rho()
+        this->solidThermo().rho()
     );
 
     forAll(RRs_, i)
@@ -658,8 +661,8 @@ Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::solve
             cellCounter_ = celli;
 
             scalar rhoi = rho[celli];
-            scalar Ti = this->solid().T()[celli];
-            scalar pi = this->solid().p()[celli];
+            scalar Ti = this->solidThermo().T()[celli];
+            scalar pi = this->solidThermo().p()[celli];
 
             scalarField c(nSpecie_, 0.0);
             scalarField c0(nSpecie_, 0.0);
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/makeSolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
index 95fa907441..779418d87b 100644
--- a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
@@ -45,7 +45,8 @@ namespace Foam
     defineTemplateTypeNameAndDebugWithName                                    \
     (                                                                         \
         SS##Comp##SThermo##GThermo,                                           \
-        #SS"<"#Comp","#SThermo","#GThermo">",                                 \
+        (#SS"<"#Comp"," + SThermo::typeName() + "," + GThermo::typeName() +   \
+        ">").c_str(),                                                         \
         0                                                                     \
     );
 
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..1cc883c298 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
@@ -79,7 +79,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("solidChemistryModel");
+    TypeName("solid");
 
 
     //- Declare run-time constructor selection tables
@@ -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
@@ -118,10 +110,10 @@ public:
     // Member Functions
 
         //- Return access to the solid thermo package
-        inline solidReactionThermo& solid();
+        inline solidReactionThermo& solidThermo();
 
         //- Return const access to the solid thermo package
-        inline const solidReactionThermo& solid() const;
+        inline const solidReactionThermo& solidThermo() const;
 
         //- Return total gases mass source term [kg/m3/s]
         virtual tmp<DimensionedField<scalar, volMesh> > RRg() const = 0;
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
index 736a61076c..240f9c7118 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.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
@@ -25,14 +25,14 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::solidReactionThermo& Foam::solidChemistryModel::solid()
+inline Foam::solidReactionThermo& Foam::solidChemistryModel::solidThermo()
 {
     return solidThermo_();
 }
 
 
 inline const Foam::solidReactionThermo&
-Foam::solidChemistryModel::solid() const
+Foam::solidChemistryModel::solidThermo() const
 {
     return solidThermo_();
 }
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C
index 0049237777..ca97c91ace 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.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
@@ -32,7 +32,7 @@ Foam::autoPtr<Foam::solidChemistryModel> Foam::solidChemistryModel::New
     const fvMesh& mesh
 )
 {
-    IOdictionary chemistryPropertiesDict
+    IOdictionary chemistryDict
     (
         IOobject
         (
@@ -45,67 +45,122 @@ Foam::autoPtr<Foam::solidChemistryModel> Foam::solidChemistryModel::New
         )
     );
 
-    const word userModel(chemistryPropertiesDict.lookup("solidChemistryModel"));
+    const dictionary& chemistryTypeDict
+    (
+        chemistryDict.subDict("chemistryType")
+    );
 
-    const word ODEModelName(chemistryPropertiesDict.lookup("chemistrySolver"));
-    const word gasThermoName(chemistryPropertiesDict.lookup("gasThermoModel"));
+    Info<< "Selecting chemistry type " << chemistryTypeDict << endl;
 
-    // construct chemistry model type name by inserting first template argument
-    const label tempOpen = userModel.find('<');
-    const label tempClose = userModel.find('>');
-
-    const word className = userModel(0, tempOpen);
-    const word thermoTypeName =
-        userModel(tempOpen + 1, tempClose - tempOpen - 1);
-
-    const word modelType =
-        ODEModelName + '<' + className
-      + '<' + typeName + ',' + thermoTypeName + ',' + gasThermoName + ">>";
-
-
-    if (debug)
+    const int nCmpt = 12;
+    const char* cmptNames[nCmpt] =
     {
-        Info<< "Selecting solidChemistryModel " << modelType << endl;
-    }
-    else
-    {
-        Info<< "Selecting solidChemistryModel " << userModel + gasThermoName
-            << endl;
-    }
+        "chemistrySolver",
+        "chemistryThermo",
+        "transport",
+        "thermo",
+        "equationOfState",
+        "specie",
+        "energy",
+        "transport",
+        "thermo",
+        "equationOfState",
+        "specie",
+        "energy"
+    };
+
+    IOdictionary thermoDict
+    (
+        IOobject
+        (
+            "thermophysicalProperties",
+            mesh.time().constant(),
+            mesh,
+            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    const dictionary& solidThermoTypeDict(thermoDict.subDict("thermoType"));
+    word solidThermoTypeName
+    (
+        word(solidThermoTypeDict.lookup("transport")) + '<'
+      + word(solidThermoTypeDict.lookup("thermo")) + '<'
+      + word(solidThermoTypeDict.lookup("equationOfState")) + '<'
+      + word(solidThermoTypeDict.lookup("specie")) + ">>,"
+      + word(solidThermoTypeDict.lookup("energy")) + ">"
+    );
+
+    const dictionary& gasThermoTypeDict(thermoDict.subDict("gasThermoType"));
+    word gasThermoTypeName
+    (
+        word(gasThermoTypeDict.lookup("transport")) + '<'
+      + word(gasThermoTypeDict.lookup("thermo")) + '<'
+      + word(gasThermoTypeDict.lookup("equationOfState")) + '<'
+      + word(gasThermoTypeDict.lookup("specie")) + ">>,"
+      + word(gasThermoTypeDict.lookup("energy")) + ">"
+    );
+
+    // Construct the name of the chemistry type from the components
+    word chemistryTypeName
+    (
+        word(chemistryTypeDict.lookup("chemistrySolver")) + '<'
+      + word(chemistryTypeDict.lookup("chemistryThermo")) + ','
+      + solidThermoTypeName + ',' + gasThermoTypeName + ">"
+    );
+
+    Info<< "chemistryTypeName " << chemistryTypeName << endl;
 
     fvMeshConstructorTable::iterator cstrIter =
-        fvMeshConstructorTablePtr_->find(modelType);
+        fvMeshConstructorTablePtr_->find(chemistryTypeName);
 
     if (cstrIter == fvMeshConstructorTablePtr_->end())
     {
-        if (debug)
-        {
-            FatalErrorIn("solidChemistryModel::New(const mesh&)")
-                << "Unknown solidChemistryModel type "
-                << modelType << nl << nl
-                << "Valid solidChemistryModel types are:" << nl
-                << fvMeshConstructorTablePtr_->sortedToc() << nl
-                << exit(FatalError);
-        }
-        else
-        {
-            wordList models = fvMeshConstructorTablePtr_->sortedToc();
-            forAll(models, i)
-            {
-                models[i] = models[i].replace(typeName + ',', "");
-            }
+        FatalErrorIn(typeName + "::New(const mesh&)")
+            << "Unknown " << typeName << " type " << nl
+            << "chemistryType" << chemistryTypeDict << nl << nl
+            << "Valid " << typeName << " types are:"
+            << nl << nl;
 
-            FatalErrorIn("solidChemistryModel::New(const mesh&)")
-                << "Unknown solidChemistryModel type "
-                << userModel << nl << nl
-                << "Valid solidChemistryModel types are:" << nl
-                << models << nl
-                << exit(FatalError);
+        // Get the list of all the suitable chemistry packages available
+        wordList validChemistryTypeNames
+        (
+            fvMeshConstructorTablePtr_->sortedToc()
+        );
+        Info<< validChemistryTypeNames << endl;
+
+        // Build a table of the thermo packages constituent parts
+        // Note: row-0 contains the names of constituent parts
+        List<wordList> validChemistryTypeNameCmpts
+        (
+            validChemistryTypeNames.size() + 1
+        );
+
+        validChemistryTypeNameCmpts[0].setSize(nCmpt);
+        forAll(validChemistryTypeNameCmpts[0], j)
+        {
+            validChemistryTypeNameCmpts[0][j] = cmptNames[j];
         }
+
+        // Split the thermo package names into their constituent parts
+        forAll(validChemistryTypeNames, i)
+        {
+            validChemistryTypeNameCmpts[i+1] = basicThermo::splitThermoName
+            (
+                validChemistryTypeNames[i],
+                nCmpt
+            );
+        }
+
+        // Print the table of available packages
+        // in terms of their constituent parts
+        printTable(validChemistryTypeNameCmpts, FatalError);
+
+        FatalError<< exit(FatalError);
     }
 
-    return autoPtr<solidChemistryModel>
-        (cstrIter()(mesh, ODEModelName, thermoTypeName));
+    return autoPtr<solidChemistryModel>(cstrIter()(mesh));
 }
 
 
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
index f528bc50a5..e891cba45b 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.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
@@ -39,22 +39,23 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSolidChemistrySolverType(SS, ODEChem, Comp, SThermo, GThermo)     \
+#define makeSolidChemistrySolverType(SS, Comp, SThermo, GThermo)              \
                                                                               \
-    typedef SS<ODEChem<Comp, SThermo, GThermo> >                              \
-        SS##ODEChem##Comp##SThermo##GThermo;                                  \
+    typedef SS<ODESolidChemistryModel<Comp, SThermo, GThermo> >               \
+        SS##Comp##SThermo##GThermo;                                           \
                                                                               \
     defineTemplateTypeNameAndDebugWithName                                    \
     (                                                                         \
-        SS##ODEChem##Comp##SThermo##GThermo,                                  \
-        #SS"<"#ODEChem"<"#Comp","#SThermo","#GThermo">>",                     \
+        SS##Comp##SThermo##GThermo,                                           \
+        (#SS"<" + word(Comp::typeName_())                                     \
+      + "," + SThermo::typeName() + "," + GThermo::typeName() + ">").c_str(), \
         0                                                                     \
     );                                                                        \
                                                                               \
     addToRunTimeSelectionTable                                                \
     (                                                                         \
         Comp,                                                                 \
-        SS##ODEChem##Comp##SThermo##GThermo,                                  \
+        SS##Comp##SThermo##GThermo,                                           \
         fvMesh                                                                \
     );
 
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
index 64cc731266..a207428aba 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
@@ -39,7 +39,6 @@ namespace Foam
     makeSolidChemistrySolverType
     (
         ode,
-        ODESolidChemistryModel,
         solidChemistryModel,
         hConstSolidThermoPhysics,
         gasThermoPhysics
@@ -48,7 +47,6 @@ namespace Foam
     makeSolidChemistrySolverType
     (
         ode,
-        ODESolidChemistryModel,
         solidChemistryModel,
         hExponentialSolidThermoPhysics,
         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/include/solidThermoPhysicsTypes.H b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H
index 15b0a1c6ea..c1269e8000 100644
--- a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H
+++ b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H
@@ -39,7 +39,6 @@ Description
 #include "constIsoSolidTransport.H"
 #include "constAnIsoSolidTransport.H"
 #include "exponentialSolidTransport.H"
-#include "constSolidRad.H"
 #include "sensibleEnthalpy.H"
 #include "thermo.H"
 
@@ -50,16 +49,13 @@ namespace Foam
     typedef
         constIsoSolidTransport
         <
-            constSolidRad
+            species::thermo
             <
-                species::thermo
+                hConstThermo
                 <
-                    hConstThermo
-                    <
-                        rhoConst<specie>
-                    >,
-                    sensibleEnthalpy
-                >
+                    rhoConst<specie>
+                >,
+                sensibleEnthalpy
             >
         >
         hConstSolidThermoPhysics;
@@ -67,16 +63,13 @@ namespace Foam
     typedef
         exponentialSolidTransport
         <
-            constSolidRad
+            species::thermo
             <
-                species::thermo
+                hExponentialThermo
                 <
-                    hExponentialThermo
-                    <
-                        rhoConst<specie>
-                    >,
-                    sensibleEnthalpy
-                >
+                    rhoConst<specie>
+                >,
+                sensibleEnthalpy
             >
         >
         hExponentialSolidThermoPhysics;
diff --git a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H b/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H
deleted file mode 100644
index b9d19591b3..0000000000
--- a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H
+++ /dev/null
@@ -1,171 +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::constSolidRad
-
-Description
-    Constant radiative properties
-
-SourceFiles
-    constSolidRadI.H
-    constSolidRad.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef constSolidRad_H
-#define constSolidRad_H
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-template<class Thermo> class constSolidRad;
-
-template<class Thermo>
-inline constSolidRad<Thermo> operator*
-(
-    const scalar,
-    const constSolidRad<Thermo>&
-);
-
-template<class Thermo>
-Ostream& operator<<
-(
-    Ostream&,
-    const constSolidRad<Thermo>&
-);
-
-/*---------------------------------------------------------------------------*\
-                        Class constSolidRad Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Thermo>
-class constSolidRad
-:
-    public Thermo
-{
-    // Private data
-
-        //- Absorption coefficient
-        scalar kappaRad_;
-
-        //- Scattering coefficient
-        scalar sigmaS_;
-
-        //- Emissivity coefficient
-        scalar emissivity_;
-
-
-         //- Construct from components
-        inline constSolidRad
-        (
-            const Thermo& t,
-            const scalar kappaRad,
-            const scalar sigmaS,
-            const scalar emissivity
-        );
-
-
-public:
-
-    // Constructors
-
-        //- Construct from Istream
-        constSolidRad(const dictionary&);
-
-        //- Construct as named copy
-        inline constSolidRad(const word& name, const constSolidRad&);
-
-        //- Construct and return a clone
-        inline autoPtr<constSolidRad> clone() const;
-
-        // Selector from Istream
-        inline static autoPtr<constSolidRad> New(Istream& is);
-
-
-    // Member functions
-
-        //- Return the instantiated type name
-        static word typeName()
-        {
-            return "const<" + Thermo::typeName() + '>';
-        }
-
-        //- Return absorption coefficient [1/m]
-        inline scalar kappaRad(scalar T) const;
-
-        //- Return scattering [1/m]
-        inline scalar sigmaS(scalar T) const;
-
-        //- Return  emissivity[]
-        inline scalar emissivity(scalar T) const;
-
-        //- Write to Ostream
-        void write(Ostream& os) const;
-
-
-    // Member operators
-
-        inline constSolidRad& operator=(const constSolidRad&);
-        inline void operator+=(const constSolidRad&);
-        inline void operator-=(const constSolidRad&);
-
-
-    // Friend operators
-
-        friend constSolidRad operator* <Thermo>
-        (
-            const scalar,
-            const constSolidRad&
-        );
-
-
-    // Ostream Operator
-
-        friend Ostream& operator<< <Thermo>
-        (
-            Ostream&,
-            const constSolidRad&
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "constSolidRadI.H"
-
-#ifdef NoRepository
-#   include "constSolidRad.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRadI.H b/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRadI.H
deleted file mode 100644
index 2e7ce65cc1..0000000000
--- a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRadI.H
+++ /dev/null
@@ -1,179 +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 "constSolidRad.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class thermo>
-inline Foam::constSolidRad<thermo>::constSolidRad
-(
-    const thermo& t,
-    const scalar kappaRad,
-    const scalar sigmaS,
-    const scalar emissivity
-)
-:
-    thermo(t),
-    kappaRad_(kappaRad),
-    sigmaS_(sigmaS),
-    emissivity_(emissivity)
-{}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-
-template<class thermo>
-inline Foam::constSolidRad<thermo>::constSolidRad
-(
-    const word& name,
-    const constSolidRad& pg
-)
-:
-    thermo(name, pg),
-    kappaRad_(pg.kappaRad_),
-    sigmaS_(pg.sigmaS_),
-    emissivity_(pg.emissivity_)
-{}
-
-
-template<class thermo>
-inline Foam::autoPtr<Foam::constSolidRad<thermo> >
-Foam::constSolidRad<thermo>::clone() const
-{
-    return autoPtr<constSolidRad<thermo> >(new constSolidRad<thermo>(*this));
-}
-
-
-template<class thermo>
-inline Foam::autoPtr<Foam::constSolidRad<thermo> >
-Foam::constSolidRad<thermo>::New(Istream& is)
-{
-    return autoPtr<constSolidRad<thermo> >(new constSolidRad<thermo>(is));
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class thermo>
-inline Foam::scalar Foam::constSolidRad<thermo>::kappaRad(scalar) const
-{
-    return kappaRad_;
-}
-
-
-template<class thermo>
-inline Foam::scalar Foam::constSolidRad<thermo>::sigmaS(scalar) const
-{
-    return sigmaS_;
-}
-
-
-template<class thermo>
-inline Foam::scalar Foam::constSolidRad<thermo>::emissivity(scalar) const
-{
-    return emissivity_;
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class thermo>
-inline Foam::constSolidRad<thermo>&
-Foam::constSolidRad<thermo>::operator=(const constSolidRad<thermo>& ct)
-{
-    thermo::operator=(ct);
-
-    kappaRad_ = ct.kappaRad_;
-    sigmaS_ = ct.sigmaS_;
-    emissivity_ = ct.emissivity_;
-
-    return *this;
-}
-
-
-template<class thermo>
-inline void Foam::constSolidRad<thermo>::operator+=
-(
-    const constSolidRad<thermo>& ct
-)
-{
-    scalar molr1 = this->nMoles();
-
-    thermo::operator+=(ct);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
-
-    kappaRad_ = molr1*kappaRad_ + molr2*ct.kappaRad_;
-    sigmaS_ = molr1*sigmaS_ + molr2*ct.sigmaS_;
-    emissivity_ = molr1*emissivity_ + molr2*ct.emissivity_;
-}
-
-
-template<class thermo>
-inline void Foam::constSolidRad<thermo>::operator-=
-(
-    const constSolidRad<thermo>& ct
-)
-{
-    scalar molr1 = this->nMoles();
-
-    thermo::operator-=(ct);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
-
-    kappaRad_ = molr1*kappaRad_ - molr2*ct.kappaRad_;
-    sigmaS_ = molr1*sigmaS_ - molr2*ct.sigmaS_;
-    emissivity_ = molr1*emissivity_ - molr2*ct.emissivity_;
-}
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-template<class thermo>
-inline Foam::constSolidRad<thermo> Foam::operator*
-(
-    const scalar s,
-    const constSolidRad<thermo>& ct
-)
-{
-    return constSolidRad<thermo>
-    (
-        s*static_cast<const thermo&>(ct),
-        ct.kappaRad_,
-        ct.sigmaS_,
-        ct.emissivity_
-    );
-}
-
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-
-// ************************************************************************* //
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..8ed7c05dfd 100644
--- a/src/thermophysicalModels/solidThermo/Make/files
+++ b/src/thermophysicalModels/solidThermo/Make/files
@@ -1,10 +1,8 @@
 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/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.C b/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.C
index bc498e21da..eb5d1f3c2b 100644
--- a/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.C
+++ b/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.C
@@ -48,7 +48,7 @@ Foam::reactingSolidMixture<ThermoSolidType>::reactingSolidMixture
         (
             this->components_,
             mesh.lookupObject<dictionary>
-                ("chemistryProperties").lookup("species")
+                ("thermophysicalProperties").lookup("gaseousSpecies")
         )
     )
 {}
diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C
index 00f75ac7cc..77184b166b 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);
 }
 
@@ -54,6 +54,27 @@ Foam::solidReactionThermo::solidReactionThermo
 {}
 
 
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::solidReactionThermo> Foam::solidReactionThermo::New
+(
+    const fvMesh& mesh
+)
+{
+    return basicThermo::New<solidReactionThermo>(mesh);
+}
+
+
+Foam::autoPtr<Foam::solidReactionThermo> Foam::solidReactionThermo::New
+(
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+{
+    return basicThermo::New<solidReactionThermo>(mesh, dict);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::solidReactionThermo::~solidReactionThermo()
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
deleted file mode 100644
index 6ef34f0e76..0000000000
--- a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C
+++ /dev/null
@@ -1,107 +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 "solidReactionThermo.H"
-#include "fvMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::solidReactionThermo> Foam::solidReactionThermo::New
-(
-    const fvMesh& mesh
-)
-{
-    // get model name, but do not register the dictionary
-    // otherwise it is registered in the database twice
-    const word modelType
-    (
-        IOdictionary
-        (
-            IOobject
-            (
-                "thermophysicalProperties",
-                mesh.time().constant(),
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        ).lookup("thermoType")
-    );
-
-    Info<< "Selecting thermodynamics package " << modelType << endl;
-
-    meshConstructorTable::iterator cstrIter =
-        meshConstructorTablePtr_->find(modelType);
-
-    if (cstrIter == meshConstructorTablePtr_->end())
-    {
-        FatalErrorIn("solidReactionThermo::New(const fvMesh&)")
-            << "Unknown solidReactionThermo type "
-            << modelType << nl << nl
-            << "Valid solidReactionThermo types:" << nl
-            << meshConstructorTablePtr_->sortedToc() << nl
-            << exit(FatalError);
-    }
-
-    return autoPtr<solidReactionThermo>(cstrIter()(mesh));
-}
-
-
-Foam::autoPtr<Foam::solidReactionThermo> Foam::solidReactionThermo::New
-(
-    const fvMesh& mesh,
-    const dictionary& dict
-)
-{
-    if (debug)
-    {
-        Info<< "solidReactionThermo::New(const fvMesh&, const dictionary&): "
-            << "constructing solidReactionThermo"
-            << endl;
-    }
-
-    const word thermoType = dict.lookup("thermoType");
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(thermoType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "solidReactionThermo::New(const fvMesh&, const dictionary&)"
-        )   << "Unknown solidReactionThermo type " << thermoType
-            << endl << endl
-            << "Valid solidReactionThermo types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<solidReactionThermo>(cstrIter()(mesh, dict));
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C
similarity index 53%
rename from src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.C
rename to src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C
index 8348899c45..cbfa81b30e 100644
--- a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.C
+++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C
@@ -23,52 +23,40 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "constSolidRad.H"
-#include "IOstreams.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"
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+/* * * * * * * * * * * * * * * * * Enthalpy-based * * * * * * * * * * * * * */
 
-template<class thermo>
-constSolidRad<thermo>::constSolidRad(const dictionary& dict)
-:
-    thermo(dict),
-    kappaRad_(readScalar(dict.subDict("radiation").lookup("kappaRad"))),
-    sigmaS_(readScalar(dict.subDict("radiation").lookup("sigmaS"))),
-    emissivity_(readScalar(dict.subDict("radiation").lookup("emissivity")))
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class thermo>
-void Foam::constSolidRad<thermo>::constSolidRad::write(Ostream& os) const
-{
-    thermo::write(os);
-
-    dictionary dict("radiation");
-    dict.add("kappaRad", kappaRad_);
-    dict.add("sigmaS", sigmaS_);
-    dict.add("emissivity", emissivity_);
-    os  << indent << dict.dictName() << dict;
-}
-
-
-// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
-
-template<class thermo>
-Ostream& operator<<(Ostream& os, const constSolidRad<thermo>& pg)
-{
-    os  << static_cast<const thermo&>(pg);
-    os << tab << pg.kappaRad_ << tab << pg.sigmaS_ << tab << pg.emissivity_;
-
-    os.check("Ostream& operator<<(Ostream& os, const constSolidRad& st)");
-    return os;
-}
+makeSolidThermo
+(
+    solidReactionThermo,
+    heSolidThermo,
+    reactingSolidMixture,
+    constIsoSolidTransport,
+    sensibleEnthalpy,
+    hConstThermo,
+    rhoConst,
+    specie
+);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
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.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C
index c5ebf5731c..faf4ea6155 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C
@@ -81,6 +81,27 @@ Foam::solidThermo::solidThermo
 {}
 
 
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::solidThermo> Foam::solidThermo::New
+(
+    const fvMesh& 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);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::solidThermo::~solidThermo()
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
deleted file mode 100644
index 28871b9f75..0000000000
--- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C
+++ /dev/null
@@ -1,111 +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 "solidThermo.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-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));
-}
-
-
-Foam::autoPtr<Foam::solidThermo> Foam::solidThermo::New
-(
-    const fvMesh& mesh,
-    const dictionary& dict
-)
-{
-    if (debug)
-    {
-        Info<< "solidThermo::New(const fvMesh&, const dictionary&): "
-            << "constructing solidThermo"
-            << endl;
-    }
-
-    const word thermoType = dict.lookup("thermoType");
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(thermoType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "solidThermo::New(const fvMesh&, const dictionary&)"
-        )   << "Unknown solidThermo type " << thermoType
-            << endl << endl
-            << "Valid solidThermo types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    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/src/thermophysicalModels/specie/thermo/absoluteInternalEnergy/absoluteInternalEnergy.H b/src/thermophysicalModels/specie/thermo/absoluteInternalEnergy/absoluteInternalEnergy.H
new file mode 100644
index 0000000000..6ea5df7dc2
--- /dev/null
+++ b/src/thermophysicalModels/specie/thermo/absoluteInternalEnergy/absoluteInternalEnergy.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 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::absoluteInternalEnergy
+
+Description
+    Thermodynamics mapping class to expose the absolute internal energy function
+    as the standard internal energy function e(T).
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef absoluteInternalEnergy_H
+#define absoluteInternalEnergy_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class absoluteInternalEnergy Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Thermo>
+class absoluteInternalEnergy
+{
+
+public:
+
+    // Constructors
+
+        //- Construct
+        absoluteInternalEnergy()
+        {}
+
+
+    // Member Functions
+
+        //- Return the instantiated type name
+        static word typeName()
+        {
+            return "absoluteInternalEnergy";
+        }
+
+        // Fundamental properties
+
+            static word name()
+            {
+                return "ea";
+            }
+
+            // Absolute internal energy [J/kmol]
+            scalar he
+            (
+                const Thermo& thermo,
+                const scalar p,
+                const scalar T
+            ) const
+            {
+                return thermo.ea(p, T);
+            }
+
+            // Heat capacity at constant volume [J/(kmol K)]
+            scalar cpv
+            (
+                const Thermo& thermo,
+                const scalar p,
+                const scalar T
+            ) const
+            {
+                return thermo.cv(p, T);
+            }
+
+            //- cp/cv []
+            scalar cpBycpv
+            (
+                const Thermo& thermo,
+                const scalar p,
+                const scalar T
+            ) const
+            {
+                return thermo.gamma(p, T);
+            }
+
+            // Absolute internal energy [J/kg]
+            scalar HE
+            (
+                const Thermo& thermo,
+                const scalar p,
+                const scalar T
+            ) const
+            {
+                return thermo.Ea(p, T);
+            }
+
+            //- Temperature from absolute internal energy
+            //  given an initial temperature T0
+            scalar THE
+            (
+                const Thermo& thermo,
+                const scalar e,
+                const scalar p,
+                const scalar T0
+            ) const
+            {
+                return thermo.TEa(e, p, T0);
+            }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H b/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
index 7adf3e34d7..b6b5889ff5 100644
--- a/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
+++ b/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
@@ -102,7 +102,7 @@ public:
                 return thermo.gamma(p, T);
             }
 
-            //- Sensible enthalpy [J/kg]
+            //- Sensible internal energy [J/kg]
             scalar HE
             (
                 const Thermo& thermo,
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
index b8642e960b..27bb855c43 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
@@ -298,15 +298,22 @@ template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::K(const scalar p, const scalar T) const
 {
-    scalar arg = -this->nMoles()*this->g(p, T)/(this->RR*T);
-
-    if (arg < 600.0)
+    if (equal(this->nMoles(), SMALL))
     {
-        return ::exp(arg);
+        return 1.0;
     }
     else
     {
-        return VGREAT;
+        scalar arg = -this->nMoles()*this->g(p, T)/(this->RR*T);
+
+        if (arg < 600.0)
+        {
+            return exp(arg);
+        }
+        else
+        {
+            return VGREAT;
+        }
     }
 }
 
@@ -406,14 +413,14 @@ inline Foam::scalar Foam::species::thermo<Thermo, Type>::THs
 template<class Thermo, template<class> class Type>
 inline Foam::scalar Foam::species::thermo<Thermo, Type>::THa
 (
-    const scalar ht,
+    const scalar ha,
     const scalar p,
     const scalar T0
 ) const
 {
     return T
     (
-        ht,
+        ha,
         p,
         T0,
         &thermo<Thermo, Type>::Ha,
@@ -446,7 +453,7 @@ inline Foam::scalar Foam::species::thermo<Thermo, Type>::TEs
 template<class Thermo, template<class> class Type>
 inline Foam::scalar Foam::species::thermo<Thermo, Type>::TEa
 (
-    const scalar e,
+    const scalar ea,
     const scalar p,
     const scalar T0
 ) const
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index c329bcc692..5a8ff1c3fb 100644
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.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
@@ -67,6 +67,8 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
 {
     const word deltaType(dict.lookup("delta"));
 
+    Info<< "Selecting LES delta type " << deltaType << endl;
+
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(deltaType);
 
@@ -86,4 +88,51 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
 }
 
 
+Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
+(
+    const word& name,
+    const fvMesh& mesh,
+    const dictionary& dict,
+    const dictionaryConstructorTable& additionalConstructors
+)
+{
+    const word deltaType(dict.lookup("delta"));
+
+    Info<< "Selecting LES delta type " << deltaType << endl;
+
+    // First on additional ones
+    dictionaryConstructorTable::const_iterator cstrIter =
+        additionalConstructors.find(deltaType);
+
+    if (cstrIter != additionalConstructors.end())
+    {
+        return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
+    }
+    else
+    {
+        dictionaryConstructorTable::const_iterator cstrIter =
+            dictionaryConstructorTablePtr_->find(deltaType);
+
+        if (cstrIter == dictionaryConstructorTablePtr_->end())
+        {
+            FatalErrorIn
+            (
+                "LESdelta::New(const fvMesh&, const dictionary&)"
+            )   << "Unknown LESdelta type "
+                << deltaType << nl << nl
+                << "Valid LESdelta types are :" << endl
+                << additionalConstructors.sortedToc()
+                << " and "
+                << dictionaryConstructorTablePtr_->sortedToc()
+                << exit(FatalError);
+            return autoPtr<LESdelta>();
+        }
+        else
+        {
+            return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
+        }
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
index 9cd15b507b..c84ae74c3b 100644
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
+++ b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.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,7 +29,6 @@ Description
 
 SourceFiles
     LESdelta.C
-    newDelta.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -111,6 +110,15 @@ public:
             const dictionary&
         );
 
+        //- Return a reference to the selected LES delta
+        static autoPtr<LESdelta> New
+        (
+            const word& name,
+            const fvMesh&,
+            const dictionary&,
+            const dictionaryConstructorTable&
+        );
+
 
     //- Destructor
     virtual ~LESdelta()
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
index f33a1681dc..1f514840ae 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
@@ -51,7 +51,7 @@ SourceFiles
 #define compressibleLESModel_H
 
 #include "compressible/turbulenceModel/turbulenceModel.H"
-#include "LESdelta.H"
+#include "compressible/LES/compressibleLESdelta/compressibleLESdelta.H"
 #include "fvm.H"
 #include "fvc.H"
 #include "fvMatrices.H"
@@ -86,7 +86,7 @@ protected:
 
         dimensionedScalar kMin_;
 
-        autoPtr<LESdelta> delta_;
+        autoPtr<Foam::LESdelta> delta_;
 
 
     // Protected Member Functions
diff --git a/src/turbulenceModels/compressible/LES/Make/files b/src/turbulenceModels/compressible/LES/Make/files
index 1ed6bd6b4b..58e7485772 100644
--- a/src/turbulenceModels/compressible/LES/Make/files
+++ b/src/turbulenceModels/compressible/LES/Make/files
@@ -10,6 +10,7 @@ homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
 DeardorffDiffStress/DeardorffDiffStress.C
 SpalartAllmaras/SpalartAllmaras.C
 
+compressibleLESdelta/compressibleLESdelta.C
 vanDriestDelta/vanDriestDelta.C
 
 LIB = $(FOAM_LIBBIN)/libcompressibleLESModels
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchFields.C b/src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.C
similarity index 65%
rename from src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchFields.C
rename to src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.C
index 9401581934..4b8fbbc44a 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchFields.C
+++ b/src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.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) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,22 +23,44 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicSymmetryFvPatchFields.H"
-#include "fvPatchFields.H"
-#include "volMesh.H"
-#include "addToRunTimeSelectionTable.H"
+#include "compressibleLESdelta.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+namespace compressible
+{
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePatchFields(basicSymmetry);
+defineRunTimeSelectionTable(LESdelta, dictionary);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+LESdelta::LESdelta(const word& name, const fvMesh& mesh)
+:
+    foamLESdelta(name, mesh)
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<foamLESdelta> LESdelta::New
+(
+    const word& name,
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+{
+    return foamLESdelta::New(name, mesh, dict, *dictionaryConstructorTablePtr_);
+}
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace compressible
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.H b/src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.H
similarity index 60%
rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.H
rename to src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.H
index 1067f0610a..56d1437cc2 100644
--- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.H
+++ b/src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.H
@@ -22,79 +22,88 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::hePsiReactionThermo
+    Foam::compressible::LESdelta
 
 Description
-    Foam::hePsiReactionThermo
+    Abstract base class for compressible LES deltas
 
 SourceFiles
-    hePsiReactionThermo.C
+    compressibleLESdelta.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef hePsiReactionThermo_H
-#define hePsiReactionThermo_H
+#ifndef compressibleLESdelta_H
+#define compressibleLESdelta_H
 
-#include "heThermo.H"
-#include "psiReactionThermo.H"
+#include "LESdelta.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// To avoid macro problems typedef scoped class
+typedef Foam::LESdelta foamLESdelta;
+
+namespace compressible
+{
+
 /*---------------------------------------------------------------------------*\
-                      Class hePsiReactionThermo Declaration
+                          Class LESdelta Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class MixtureType>
-class hePsiReactionThermo
+class LESdelta
 :
-    public heThermo<psiReactionThermo, MixtureType>
+    public foamLESdelta
 {
-    // Private Member Functions
-
-        void calculate();
-
-        //- Construct as copy (not implemented)
-        hePsiReactionThermo(const hePsiReactionThermo<MixtureType>&);
-
 
 public:
 
-    //- Runtime type information
-    TypeName("hePsiReactionThermo");
+    // Declare run-time constructor selection table
 
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            foamLESdelta,
+            dictionary,
+            (
+                const word& name,
+                const fvMesh& mesh,
+                const dictionary& LESdeltaDict
+            ),
+            (name, mesh, LESdeltaDict)
+        );
 
     // Constructors
 
-        //- Construct from mesh
-        hePsiReactionThermo(const fvMesh&);
+        //- Construct from name and mesh
+        LESdelta(const word& name, const fvMesh& mesh);
+
+
+    // Selectors
+
+        //- Return a reference to the selected LES delta
+        static autoPtr<foamLESdelta> New
+        (
+            const word& name,
+            const fvMesh& mesh,
+            const dictionary& dict
+        );
 
 
     //- Destructor
-    virtual ~hePsiReactionThermo();
-
-
-    // Member functions
-
-        //- Update properties
-        virtual void correct();
+    virtual ~LESdelta()
+    {}
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace compressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-#   include "hePsiReactionThermo.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H
index cc8158cb07..88e26c7554 100644
--- a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H
+++ b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.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
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef vanDriestDelta_H
 #define vanDriestDelta_H
 
-#include "LESdelta.H"
+#include "compressibleLESdelta.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,7 +56,7 @@ class vanDriestDelta
 {
     // Private data
 
-        autoPtr<LESdelta> geometricDelta_;
+        autoPtr<Foam::LESdelta> geometricDelta_;
         scalar kappa_;
         scalar Aplus_;
         scalar Cdelta_;
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index 175cb8b463..1528ba2aff 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -224,7 +224,8 @@ LRR::LRR
         (
             "LRR::LRR"
             "( const volScalarField&, const volVectorField&"
-            ", const surfaceScalarField&, incompressibleTransportModel&)"
+            ", const surfaceScalarField&, fluidThermo&, const word&"
+            ", const word&)"
         )   << "couplingFactor = " << couplingFactor_
             << " is not in range 0 - 1" << nl
             << exit(FatalError);
@@ -341,7 +342,7 @@ void LRR::correct()
     RASModel::correct();
 
     volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
-    volScalarField G("RASModel::G", 0.5*mag(tr(P)));
+    volScalarField G("RASModel.G", 0.5*mag(tr(P)));
 
     // Update epsilon and G at the wall
     epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index b4e906cfb4..7273efc82c 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -379,7 +379,7 @@ void LaunderGibsonRSTM::correct()
     }
 
     volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
-    volScalarField G("RASModel::G", 0.5*mag(tr(P)));
+    volScalarField G("RASModel.G", 0.5*mag(tr(P)));
 
     // Update epsilon and G at the wall
     epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 4e246491e4..048f15eec6 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -304,7 +304,7 @@ void LaunderSharmaKE::correct()
     }
 
     tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
+    volScalarField G("RASModel.G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
     tgradU.clear();
 
 
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 2048e4d2d0..70094c353b 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -303,7 +303,7 @@ void RNGkEpsilon::correct()
     volScalarField S2((tgradU() && dev(twoSymm(tgradU()))));
     tgradU.clear();
 
-    volScalarField G("RASModel::G", mut_*S2);
+    volScalarField G("RASModel.G", mut_*S2);
 
     volScalarField eta(sqrt(mag(S2))*k_/epsilon_);
     volScalarField eta3(eta*sqr(eta));
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index e8e4e70a18..c2cce3febd 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -58,7 +58,7 @@ void epsilonWallFunctionFvPatchScalarField::checkType()
 
 void epsilonWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
 {
-    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    writeEntryIfDifferent<word>(os, "G", "RASModel.G", GName_);
     os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
     os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
     os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
@@ -74,7 +74,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF),
-    GName_("RASModel::G"),
+    GName_("RASModel.G"),
     Cmu_(0.09),
     kappa_(0.41),
     E_(9.8)
@@ -109,7 +109,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF, dict),
-    GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+    GName_(dict.lookupOrDefault<word>("G", "RASModel.G")),
     Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
     E_(dict.lookupOrDefault<scalar>("E", 9.8))
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 3fb0f1c36b..d7f2f4fa5e 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -58,7 +58,7 @@ void omegaWallFunctionFvPatchScalarField::checkType()
 
 void omegaWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
 {
-    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    writeEntryIfDifferent<word>(os, "G", "RASModel.G", GName_);
     os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
     os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
     os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
@@ -75,7 +75,7 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF),
-    GName_("RASModel::G"),
+    GName_("RASModel.G"),
     Cmu_(0.09),
     kappa_(0.41),
     E_(9.8),
@@ -115,7 +115,7 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF, dict),
-    GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+    GName_(dict.lookupOrDefault<word>("G", "RASModel.G")),
     Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
     E_(dict.lookupOrDefault<scalar>("E", 9.8)),
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index 3aa8ee2ec1..7475a39f5b 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -281,7 +281,7 @@ void kEpsilon::correct()
     }
 
     tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
+    volScalarField G("RASModel.G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
     tgradU.clear();
 
     // Update epsilon and G at the wall
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index 229fb3e291..066e427741 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -392,7 +392,7 @@ void kOmegaSST::correct()
     tmp<volTensorField> tgradU = fvc::grad(U_);
     volScalarField S2(2*magSqr(symm(tgradU())));
     volScalarField GbyMu((tgradU() && dev(twoSymm(tgradU()))));
-    volScalarField G("RASModel::G", mut_*GbyMu);
+    volScalarField G("RASModel.G", mut_*GbyMu);
     tgradU.clear();
 
     // Update omega and G at the wall
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index f248d98138..537a2c8e44 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -321,7 +321,7 @@ void realizableKE::correct()
     volScalarField eta(magS*k_/epsilon_);
     volScalarField C1(max(eta/(scalar(5) + eta), scalar(0.43)));
 
-    volScalarField G("RASModel::G", mut_*(gradU && dev(twoSymm(gradU))));
+    volScalarField G("RASModel.G", mut_*(gradU && dev(twoSymm(gradU))));
 
     // Update epsilon and G at the wall
     epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
index 4424aaa88f..aa56d7cfdd 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
@@ -234,7 +234,7 @@ bool laminar::read()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace incompressible
+} // End namespace compressible
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
index 3b7802b6c5..bead5d06de 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
@@ -164,7 +164,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace incompressible
+} // End namespace compressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
index 3a9af24df8..c790bb5871 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
@@ -51,7 +51,7 @@ SourceFiles
 #define incompressibleLESModel_H
 
 #include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "LESdelta.H"
+#include "incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.H"
 #include "fvm.H"
 #include "fvc.H"
 #include "fvMatrices.H"
@@ -86,7 +86,7 @@ protected:
 
         dimensionedScalar kMin_;
 
-        autoPtr<LESdelta> delta_;
+        autoPtr<Foam::LESdelta> delta_;
 
 
     // Protected Member Functions
diff --git a/src/turbulenceModels/incompressible/LES/Make/files b/src/turbulenceModels/incompressible/LES/Make/files
index c41aefe994..6d4e3cb4d7 100644
--- a/src/turbulenceModels/incompressible/LES/Make/files
+++ b/src/turbulenceModels/incompressible/LES/Make/files
@@ -1,3 +1,4 @@
+incompressibleLESdelta/incompressibleLESdelta.C
 vanDriestDelta/vanDriestDelta.C
 
 LESModel/LESModel.C
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
index 4c8302de7d..0274a192f9 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.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
@@ -37,7 +37,7 @@ SourceFiles
 #ifndef IDDESDeltaDelta_H
 #define IDDESDeltaDelta_H
 
-#include "LESdelta.H"
+#include "incompressibleLESdelta.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,7 +54,7 @@ class IDDESDelta
 {
     // Private data
 
-        autoPtr<LESdelta> hmax_;
+        autoPtr<Foam::LESdelta> hmax_;
         scalar deltaCoeff_;
         scalar cw_;
 
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index fc31252782..c2565efb50 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -61,8 +61,8 @@ class SpalartAllmarasIDDES
 
         // Model constants
 
-            autoPtr<LESdelta> hmax_;
-            autoPtr<LESdelta> IDDESDelta_;
+            autoPtr<Foam::LESdelta> hmax_;
+            autoPtr<Foam::LESdelta> IDDESDelta_;
             dimensionedScalar fwStar_;
             dimensionedScalar cl_;
             dimensionedScalar ct_;
diff --git a/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.C b/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.C
new file mode 100644
index 0000000000..daa17b6406
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.C
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 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 "incompressibleLESdelta.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineRunTimeSelectionTable(LESdelta, dictionary);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+LESdelta::LESdelta(const word& name, const fvMesh& mesh)
+:
+    foamLESdelta(name, mesh)
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<foamLESdelta> LESdelta::New
+(
+    const word& name,
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+{
+    return foamLESdelta::New(name, mesh, dict, *dictionaryConstructorTablePtr_);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.H b/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.H
new file mode 100644
index 0000000000..ca1d5240f3
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.H
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 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::incompressible::LESdelta
+
+Description
+    Abstract base class for incompressible LES deltas
+
+SourceFiles
+    incompressibleLESdelta.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef incompressibleLESdelta_H
+#define incompressibleLESdelta_H
+
+#include "LESdelta.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// To avoid macro problems typedef scoped class
+typedef Foam::LESdelta foamLESdelta;
+
+namespace incompressible
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class LESdelta Declaration
+\*---------------------------------------------------------------------------*/
+
+class LESdelta
+:
+    public foamLESdelta
+{
+
+public:
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            foamLESdelta,
+            dictionary,
+            (
+                const word& name,
+                const fvMesh& mesh,
+                const dictionary& LESdeltaDict
+            ),
+            (name, mesh, LESdeltaDict)
+        );
+
+    // Constructors
+
+        //- Construct from name and mesh
+        LESdelta(const word& name, const fvMesh& mesh);
+
+
+    // Selectors
+
+        //- Return a reference to the selected LES delta
+        static autoPtr<foamLESdelta> New
+        (
+            const word& name,
+            const fvMesh& mesh,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~LESdelta()
+    {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.H b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.H
index 2e465b8851..217f86e9de 100644
--- a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.H
+++ b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.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
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef vanDriestDelta_H
 #define vanDriestDelta_H
 
-#include "LESdelta.H"
+#include "incompressibleLESdelta.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,7 +56,7 @@ class vanDriestDelta
 {
     // Private data
 
-        autoPtr<LESdelta> geometricDelta_;
+        autoPtr<Foam::LESdelta> geometricDelta_;
         scalar kappa_;
         scalar Aplus_;
         scalar Cdelta_;
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index 14683732b2..68f0d2b2b0 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -339,7 +339,7 @@ void LRR::correct()
     }
 
     volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
-    volScalarField G("RASModel::G", 0.5*mag(tr(P)));
+    volScalarField G("RASModel.G", 0.5*mag(tr(P)));
 
     // Update epsilon and G at the wall
     epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 10de46f587..17d9157c90 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -252,7 +252,7 @@ void LamBremhorstKE::correct()
         y_.correct();
     }
 
-    volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_))));
+    volScalarField G("RASModel.G", nut_*2*magSqr(symm(fvc::grad(U_))));
 
 
     // Calculate parameters and coefficients for low-Reynolds number model
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 1231be6d5d..c6ee7a7d44 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -386,7 +386,7 @@ void LaunderGibsonRSTM::correct()
     }
 
     volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
-    volScalarField G("RASModel::G", 0.5*mag(tr(P)));
+    volScalarField G("RASModel.G", 0.5*mag(tr(P)));
 
     // Update epsilon and G at the wall
     epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index c514a378e2..53cc490f29 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -255,7 +255,7 @@ void LaunderSharmaKE::correct()
 
     tmp<volScalarField> S2 = 2*magSqr(symm(fvc::grad(U_)));
 
-    volScalarField G("RASModel::G", nut_*S2);
+    volScalarField G("RASModel.G", nut_*S2);
 
     const volScalarField E(2.0*nu()*nut_*fvc::magSqrGradGrad(U_));
     const volScalarField D(2.0*nu()*magSqr(fvc::grad(sqrt(k_))));
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index 20d8dee951..8eb972dcfb 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -356,7 +356,7 @@ void LienCubicKE::correct()
 
     volScalarField G
     (
-        "RASModel::G",
+        "RASModel.G",
         Cmu_*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU)
     );
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index da81b66edd..5162fa78bd 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -446,7 +446,7 @@ void LienCubicKELowRe::correct()
 
     volScalarField G
     (
-        "RASModel::G",
+        "RASModel.G",
         Cmu_*fMu*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU)
     );
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index 15296cdf5b..6daecaae6b 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -319,7 +319,7 @@ void LienLeschzinerLowRe::correct()
 
     const volScalarField f2(scalar(1) - 0.3*exp(-sqr(Rt)));
 
-    volScalarField G("RASModel::G", Cmu_*fMu*sqr(k_)/epsilon_*S2);
+    volScalarField G("RASModel.G", Cmu_*fMu*sqr(k_)/epsilon_*S2);
 
 
     // Dissipation equation
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
index 4dbb7b7b68..750a4dc15b 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
@@ -348,7 +348,7 @@ void NonlinearKEShih::correct()
 
     volScalarField G
     (
-        "RASModel::G",
+        "RASModel.G",
         Cmu_*sqr(k_)/epsilon_*S2
       - (nonlinearStress_ && gradU)
     );
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 460a6609ac..20ed988ca7 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -267,7 +267,7 @@ void RNGkEpsilon::correct()
     }
 
     const volScalarField S2(2*magSqr(symm(fvc::grad(U_))));
-    volScalarField G("RASModel::G", nut_*S2);
+    volScalarField G("RASModel.G", nut_*S2);
 
     const volScalarField eta(sqrt(S2)*k_/epsilon_);
     volScalarField R
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index 17247003e3..3fcb175fb3 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -59,7 +59,7 @@ void epsilonWallFunctionFvPatchScalarField::checkType()
 
 void epsilonWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
 {
-    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    writeEntryIfDifferent<word>(os, "G", "RASModel.G", GName_);
     os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
     os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
     os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
@@ -75,7 +75,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF),
-    GName_("RASModel::G"),
+    GName_("RASModel.G"),
     Cmu_(0.09),
     kappa_(0.41),
     E_(9.8)
@@ -110,7 +110,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF, dict),
-    GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+    GName_(dict.lookupOrDefault<word>("G", "RASModel.G")),
     Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
     E_(dict.lookupOrDefault<scalar>("E", 9.8))
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 8d412c466a..0ad2595c7c 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -59,7 +59,7 @@ void omegaWallFunctionFvPatchScalarField::checkType()
 
 void omegaWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
 {
-    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    writeEntryIfDifferent<word>(os, "G", "RASModel.G", GName_);
     os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
     os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
     os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
@@ -76,7 +76,7 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF),
-    GName_("RASModel::G"),
+    GName_("RASModel.G"),
     Cmu_(0.09),
     kappa_(0.41),
     E_(9.8),
@@ -115,7 +115,7 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF, dict),
-    GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+    GName_(dict.lookupOrDefault<word>("G", "RASModel.G")),
     Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
     E_(dict.lookupOrDefault<scalar>("E", 9.8)),
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index 673a8f719f..c12783bcdb 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -235,7 +235,7 @@ void kEpsilon::correct()
         return;
     }
 
-    volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_))));
+    volScalarField G("RASModel.G", nut_*2*magSqr(symm(fvc::grad(U_))));
 
     // Update epsilon and G at the wall
     epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
index 052e9629c7..f2faf19966 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
@@ -244,7 +244,7 @@ void kOmega::correct()
         return;
     }
 
-    volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_))));
+    volScalarField G("RASModel.G", nut_*2*magSqr(symm(fvc::grad(U_))));
 
     // Update omega and G at the wall
     omega_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index 9344ca0d7e..02899ec4c9 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -364,7 +364,7 @@ void kOmegaSST::correct()
     }
 
     const volScalarField S2(2*magSqr(symm(fvc::grad(U_))));
-    volScalarField G("RASModel::G", nut_*S2);
+    volScalarField G("RASModel.G", nut_*S2);
 
     // Update omega and G at the wall
     omega_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C.new b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C.new
index df658f5ca9..b28e14bce9 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C.new
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C.new
@@ -341,7 +341,7 @@ void kOmegaSST::correct()
     }
 
     volScalarField S2 = magSqr(symm(fvc::grad(U_)));
-    volScalarField G("RASModel::G", nut_*2*S2);
+    volScalarField G("RASModel.G", nut_*2*S2);
 
     // Update omega and G at the wall
     omega_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
index 1fd761b1d7..03a3b8a5a6 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
@@ -311,7 +311,7 @@ void qZeta::correct()
 
     tmp<volScalarField> S2 = 2*magSqr(symm(fvc::grad(U_)));
 
-    volScalarField G("RASModel::G", nut_/(2.0*q_)*S2);
+    volScalarField G("RASModel.G", nut_/(2.0*q_)*S2);
     const volScalarField E(nu()*nut_/q_*fvc::magSqrGradGrad(U_));
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index 5ea6831ea2..3161d16371 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -297,7 +297,7 @@ void realizableKE::correct()
     const volScalarField eta(magS*k_/epsilon_);
     tmp<volScalarField> C1 = max(eta/(scalar(5) + eta), scalar(0.43));
 
-    volScalarField G("RASModel::G", nut_*S2);
+    volScalarField G("RASModel.G", nut_*S2);
 
     // Update epsilon and G at the wall
     epsilon_.boundaryField().updateCoeffs();
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/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/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/chemistryProperties b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
index b0ebc946d4..b08455efb4 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   psi;
 }
 
 chemistry       on;
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/chemistryProperties b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
index 07d0e5d36e..0f13184b2f 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   psi;
 }
 
 chemistry       on;
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/chemistryProperties b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
index 277f2632be..50aebd8dce 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   psi;
 }
 
 chemistry       on;
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..b7c4847d5b 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
@@ -17,13 +17,14 @@ FoamFile
 
 thermoType
 {
-    type            heheuReactionThermo;
+    type            heheuPsiThermo;
     mixture         inhomogeneousMixture;
     transport       sutherland;
     thermo          janaf;
     equationOfState perfectGas;
     specie          specie;
     energy          absoluteEnthalpy;
+    //energy          absoluteInternalEnergy;
 }
 
 stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336;
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
index 3c1bc03aee..9bfa83ecf5 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
@@ -31,6 +31,8 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phi,K)      Gauss upwind;
     div(phid,p)     Gauss upwind;
+    div(meshPhi,p)  Gauss upwind;
+    div(phiv,p)     Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,R)      Gauss upwind;
@@ -45,6 +47,8 @@ divSchemes
         b   limitedLinear01 1;
         ha  limitedLinear 1;
         hau limitedLinear 1;
+        ea  limitedLinear 1;
+        eau limitedLinear 1;
     };
     div(U)          Gauss linear;
     div((Su*grad(b))) Gauss linear;
@@ -54,17 +58,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(muEff,U) Gauss linear corrected;
-    laplacian(DkEff,k) Gauss linear limited 0.5;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.5;
-    laplacian(DREff,R) Gauss linear limited 0.5;
-    laplacian((rho*(1|A(U))),p) Gauss linear limited 0.5;
-    laplacian(alphaEff,b) Gauss linear limited 0.5;
-    laplacian(muEff,ft) Gauss linear limited 0.5;
-    laplacian(alphaEff,ha) Gauss linear limited 0.5;
-    laplacian(alphaEff,hau) Gauss linear limited 0.5;
-    laplacian(alphaEff,ft) Gauss linear limited 0.5;
+    default         Gauss linear limited 0.5;
 }
 
 interpolationSchemes
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
index f020df3d4e..b164746874 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
@@ -47,14 +47,14 @@ solvers
         relTol          0;
     }
 
-    "(U|Xi|hau|ft|b|ha|k|epsilon)"
+    "(U|Xi|hau|eau|ft|b|ha|ea|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0.1;
     }
-    "(U|ft|Xi|hau|b|ha|k|epsilon)Final"
+    "(U|ft|Xi|hau|eau|b|ha|ea|k|epsilon)Final"
     {
         $U;
         tolerance       1e-05;
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
index 8997679307..c670ea7e1d 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
@@ -32,7 +32,7 @@ boundaryField
     {
         type            greyDiffusiveRadiation;
         T               T;
-        emissivityMode  solidThermo;
+        emissivityMode  solidRadiation;
         value           uniform 0;
     }
 }
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Ychar b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Ychar
index d2276ce443..382bcddd50 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Ychar
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Ychar
@@ -17,7 +17,7 @@ FoamFile
 
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   uniform 0;
+internalField   uniform 1;
 
 boundaryField
 {
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Yv b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Yv
index de59e24d8a..f3f321b06b 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Yv
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Yv
@@ -17,7 +17,7 @@ FoamFile
 
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   uniform 1;
+internalField   uniform 0.5;
 
 boundaryField
 {
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
index 18ee08d01e..5051adef2c 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
@@ -15,14 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solidChemistryModel  ODESolidChemistryModel<hConstSolidThermoPhysics>;
-
-gasThermoModel      gasThermoPhysics;
+chemistryType
+{
+    chemistrySolver   ode;
+    chemistryThermo   solid;
+}
 
 chemistry           on;
 
-chemistrySolver     ode;
-
 initialChemicalTimeStep 1e-07;
 
 odeCoeffs
@@ -31,11 +31,6 @@ odeCoeffs
     eps             0.05;
 }
 
-species
-(
-    gas
-);
-
 reactions
 (
     irreversibleSolidArrheniusReaction
@@ -44,26 +39,4 @@ reactions
 );
 
 
-gas
-{
-    specie
-    {
-        nMoles          1;
-        molWeight       18.0153;
-    }
-    thermodynamics
-    {
-        Tlow            200;
-        Thigh           5000;
-        Tcommon         1000;
-        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.20100e-10 -6.39162e-15 -29899.2 6.86282 );
-        lowCpCoeffs     ( 3.38684 0.00347498 -6.35470e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
-}
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/radiationProperties
new file mode 100644
index 0000000000..fcc65973ab
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/radiationProperties
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel greyMeanSolidAbsorptionEmission;
+
+
+greyMeanSolidAbsorptionEmissionCoeffs
+{
+
+    v
+    {
+        absorptivity    0.0;  //opaque
+        emissivity      0.17;
+    }
+
+    char
+    {
+        absorptivity    0.0;
+        emissivity      0.85;
+    }
+
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
index 57e0ddc7b1..6f70cdd8c8 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
@@ -14,13 +14,36 @@ 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;
+}
+
+gasThermoType
+{
+    transport       sutherland;
+    thermo          janaf;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
 
 solidComponents
 (
     v char
 );
 
+gaseousSpecies
+(
+    gas
+);
+
 vCoeffs
 {
     specie
@@ -32,12 +55,6 @@ vCoeffs
     {
         kappa       0.135;
     }
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;  //opaque
-        emissivity  0.17;
-    }
     thermodynamics
     {
         Cp          696;
@@ -60,12 +77,6 @@ charCoeffs
     {
         kappa       0.4;
     }
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.85;
-    }
     thermodynamics
     {
         Cp          611;
@@ -77,4 +88,27 @@ charCoeffs
     }
 };
 
+gasCoeffs
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.20100e-10 -6.39162e-15 -29899.2 6.86282 );
+        lowCpCoeffs     ( 3.38684 0.00347498 -6.35470e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties
index df24e86f8d..3a9dd82a19 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties
@@ -39,13 +39,13 @@ fvDOMCoeffs
 // Number of flow iterations per radiation iteration
 solverFreq 10;
 
-//absorptionEmissionModel constantAbsorptionEmission;
-absorptionEmissionModel greyMeanAbsorptionEmission;
+absorptionEmissionModel constantAbsorptionEmission;
+//absorptionEmissionModel greyMeanAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    a               a [ 0 -1 0 0 0 0 0 ] 0.01;
-    e               e [ 0 -1 0 0 0 0 0 ] 0.01;
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.01;
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.01;
     E               E [ 1 -1 -3 0 0 0 0 ] 0;
 }
 
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/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
index f9ff27414e..0aafc68964 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
@@ -42,9 +42,9 @@ absorptionEmissionModel greyMeanAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    a               a [ 0 -1 0 0 0 0 0 ] 0.01;
-    e               e [ 0 -1 0 0 0 0 0 ] 0.01;
-    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+   absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.1;
+   emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.1;
+   E               E   [ 1 -1 -3 0 0 0 0 ] 0;
 }
 
 greyMeanAbsorptionEmissionCoeffs
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/chemistryProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
index 103c36caab..62fbf8fb24 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   psi;
 }
 
 chemistry       off;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
index 60bbcc81c4..bc7ac95c82 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
@@ -43,9 +43,9 @@ absorptionEmissionModel greyMeanAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    a               a [ 0 -1 0 0 0 0 0 ] 0.1;
-    e               e [ 0 -1 0 0 0 0 0 ] 0.1;
-    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+    absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.01;
+    emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.01;
+    E               E   [ 1 -1 -3 0 0 0 0 ] 0;
 }
 
 greyMeanAbsorptionEmissionCoeffs
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/chemistryProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
index 068c1b3f46..3ce48f2eab 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   psi;
 }
 
 chemistry           on;
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/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
index 54be80fadb..014d7ffc49 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
@@ -15,15 +15,34 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+gasThermoTypes
+{
+    constant
+    {
+        type            hePsiThermo;
+        mixture         pureMixture;
+        transport       const;
+        thermo          hConst;
+        equationOfState perfectGas;
+        specie          specie;
+        energy          sensibleEnthalpy;
+    }
+
+    janaf
+    {
+        type            hePsiThermo;
+        mixture         pureMixture;
+        transport       sutherland;
+        thermo          janaf;
+        equationOfState perfectGas;
+        specie          specie;
+        energy          sensibleEnthalpy;
+    }
+}
+
 thermoType
 {
-    type            hePsiThermo;
-    mixture         pureMixture;
-    transport       const;
-    thermo          hConst;
-    equationOfState perfectGas;
-    specie          specie;
-    energy          sensibleEnthalpy;
+    $.gasThermoTypes.constant;
 }
 
 mixture
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
index ae78848653..d58e73d6fc 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
@@ -23,8 +23,6 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
-    grad(p)         Gauss linear;
-    grad(U)         Gauss linear;
 }
 
 divSchemes
@@ -33,16 +31,14 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss limitedLinear 1;
     div(phi,e)      Gauss limitedLinear 1;
-    div(phi,Ekp)    Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
+    div(phiv,p)     Gauss limitedLinear 1;
     div((muEff*dev2(T(grad(U))))) Gauss linear 1;
 }
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(Dp,p) Gauss linear corrected;
-    laplacian(muEff,U) Gauss linear corrected;
-    laplacian(alphaEff,e) Gauss linear corrected;
+    default         Gauss linear corrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
index e4ef732976..d42c248c25 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
@@ -23,8 +23,6 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
-    grad(p)         Gauss linear;
-    grad(U)         Gauss linear;
 }
 
 divSchemes
@@ -33,16 +31,14 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss limitedLinear 1;
     div(phi,e)      Gauss limitedLinear 1;
-    div(phi,Ekp)    Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
+    div(phiv,p)     Gauss limitedLinear 1;
     div((muEff*dev2(T(grad(U))))) Gauss linear 1;
 }
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(Dp,p) Gauss linear orthogonal;
-    laplacian(muEff,U) Gauss linear orthogonal;
-    laplacian(alphaEff,e) Gauss linear orthogonal;
+    default         Gauss linear orthogonal;
 }
 
 interpolationSchemes
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
index 1103448ca8..02e15a0996 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
@@ -30,8 +30,9 @@ divSchemes
     default         none;
     div(phi,U)      Gauss limitedLinearV 1;
     div(phi,e)      Gauss limitedLinear 1;
-    div(phi,Ekp)    Gauss limitedLinear 1;
     div(phid,p)     Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
+    div(phiv,p)     Gauss limitedLinear 1;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div((muEff*dev2(T(grad(U))))) Gauss linear;
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
index 9f2b7136ac..bf71cbee70 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
@@ -30,8 +30,9 @@ divSchemes
     default         none;
     div(phi,U)      Gauss limitedLinearV 1;
     div(phi,e)      Gauss limitedLinear 1;
-    div(phi,Ekp)    Gauss limitedLinear 1;
     div(phid,p)     Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
+    div(phiv,p)     Gauss limitedLinear 1;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div((muEff*dev2(T(grad(U))))) Gauss linear;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
index 0659d6b690..b1f309e995 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
@@ -124,12 +133,6 @@ dictionaryReplacement
                     {
                         kappa           0.01;
                     }
-                    radiation
-                    {
-                        sigmaS          0;
-                        kappaRad        0;
-                        emissivity      1;
-                    }
                     thermodynamics
                     {
                         Hf              0;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties
index 4a700ec8ef..279fcb302a 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties
@@ -34,9 +34,9 @@ absorptionEmissionModel constantAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    a               a [ 0 -1 0 0 0 0 0 ] 0.5;
-    e               e [ 0 -1 0 0 0 0 0 ] 0.5;
-    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+    absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.5;
+    emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.5;
+    E               E   [ 1 -1 -3 0 0 0 0 ] 0;
 }
 
 scatterModel    constantScatter;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/radiationProperties
index b245b01c7f..db77f1c244 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/radiationProperties
@@ -42,9 +42,9 @@ absorptionEmissionModel constantAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    a               a [ 0 -1 0 0 0 0 0 ] 0.01;
-    e               e [ 0 -1 0 0 0 0 0 ] 0;
-    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+   absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.01;
+   emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.01;
+   E               E   [ 1 -1 -3 0 0 0 0 ] 0;
 }
 
 scatterModel    constantScatter;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index 884f3f652c..cc99e78017 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -97,13 +92,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
index 884f3f652c..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -92,18 +87,12 @@ charCoeffs
         nMoles      1;
         molWeight   50;
     }
+
     transport
     {
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
index 884f3f652c..cc99e78017 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -97,13 +92,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
index d4f02fb677..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties
index d4f02fb677..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties
index d4f02fb677..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
index d4f02fb677..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
index d4f02fb677..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
index d4f02fb677..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index d4f02fb677..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
index d4f02fb677..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
index d4f02fb677..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
index d8dab1a872..da52c34f5f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
@@ -49,9 +49,9 @@ absorptionEmissionModel constantAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    a               a [ 0 -1 0 0 0 0 0 ] 0.01;
-    e               e [ 0 -1 0 0 0 0 0 ] 0.01;
-    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+    absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.01;
+    emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.01;
+    E               E   [ 1 -1 -3 0 0 0 0 ] 0;
 }
 
 greyMeanAbsorptionEmissionCoeffs
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
index 99794189d6..a4db76eba2 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.5;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
index 99794189d6..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.5;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/radiationProperties
new file mode 100644
index 0000000000..0fdc177101
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/radiationProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  opaqueSolid;
+
+opaqueSolidCoeffs
+{
+}
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
index 99794189d6..4a7184c0ae 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
 {
@@ -29,13 +38,6 @@ mixture
         kappa   80;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.5;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -66,13 +68,6 @@ pmmaCoeffs
         kappa   0.152;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.1;
-    }
-
     thermodynamics
     {
         Hf      0;
@@ -98,13 +93,6 @@ charCoeffs
         kappa   0.4;
     }
 
-    radiation
-    {
-        sigmaS      0.0;
-        kappaRad    0.0;
-        emissivity  0.0;
-    }
-
     thermodynamics
     {
         Hf      0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/radiationProperties
index f5f5c8319f..22b86dfcb7 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/radiationProperties
@@ -48,9 +48,9 @@ absorptionEmissionModel constantAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    a               a [ 0 -1 0 0 0 0 0 ] 0.01;
-    e               e [ 0 -1 0 0 0 0 0 ] 0.01;
-    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+   absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.01;
+   emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.01;
+   E               E   [ 1 -1 -3 0 0 0 0 ] 0;
 }
 
 greyMeanAbsorptionEmissionCoeffs
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
index 8bb6b43941..b115024cc7 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@@ -133,7 +133,7 @@ dictionaryReplacement
             "bottomAir_to_.*"
             {
                 type            greyDiffusiveRadiationViewFactor;
-                emissivityMode  solidThermo;
+                emissivityMode  solidRadiation;
                 Qro             uniform 0;
                 value           uniform 0;
             }
@@ -158,7 +158,7 @@ dictionaryReplacement
             {
                 type            MarshakRadiation;
                 T               T;
-                emissivityMode  solidThermo;
+                emissivityMode  solidRadiation;
                 value           uniform 0;
             }
         }
@@ -182,7 +182,7 @@ dictionaryReplacement
             {
                 type            greyDiffusiveRadiation;
                 T               T;
-                emissivityMode  solidThermo;
+                emissivityMode  solidRadiation;
                 value           uniform 0;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
index cff14264b6..e629463739 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@@ -180,7 +180,7 @@ dictionaryReplacement
             "topAir_to_.*"
             {
                 type            greyDiffusiveRadiationViewFactor;
-                emissivityMode  solidThermo;
+                emissivityMode  solidRadiation;
                 Qro             uniform 0;
                 value           uniform 0;
             }
@@ -205,7 +205,7 @@ dictionaryReplacement
             {
                 type            MarshakRadiation;
                 T               T;
-                emissivityMode  solidThermo;
+                emissivityMode  solidRadiation;
                 value           uniform 0;
             }
         }
@@ -229,7 +229,7 @@ dictionaryReplacement
             {
                 type            greyDiffusiveRadiation;
                 T               T;
-                emissivityMode  solidThermo;
+                emissivityMode  solidRadiation;
                 value           uniform 0;
             }
         }
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..fa00f86001
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+motorBike.obj
+{
+    // How to obtain raw features (extractFromFile || extractFromSurface)
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    subsetFeatures
+    {
+        // Keep nonManifold edges (edges with >2 connected faces)
+        nonManifoldEdges       no;
+
+        // Keep open edges (edges with 1 connected face)
+        openEdges       yes;
+    }
+
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                yes;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties
index 2f8eb06d2b..254f5c4633 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   rho;
 }
 
 chemistry           on; // off;
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/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties
index 275a88b8d6..0fbd9de5dc 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   rho;
 }
 
 chemistry       off;
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/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
index aed335d273..e0706fc235 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   psi;
 }
 
 chemistry       on;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
index fcab4e1173..53bb15e1f7 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
@@ -39,9 +39,9 @@ binaryAbsorptionEmissionCoeffs
         absorptionEmissionModel constantAbsorptionEmission;
         constantAbsorptionEmissionCoeffs
         {
-            a               a [ 0 -1 0 0 0 0 0 ] 0.5;
-            e               e [ 0 -1 0 0 0 0 0 ] 0.5;
-            E               E [ 1 -1 -3 0 0 0 0 ] 0;
+            absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.5;
+            emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.5;
+            E               E   [ 1 -1 -3 0 0 0 0 ] 0;
         }
     }
     model2
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/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
index c0ecd63722..8fbc88a1b3 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   psi;
 }
 
 chemistry       off;
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/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
index c0ecd63722..8fbc88a1b3 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   psi;
 }
 
 chemistry       off;
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/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
index c0ecd63722..8fbc88a1b3 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   psi;
 }
 
 chemistry       off;
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/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
index c0ecd63722..8fbc88a1b3 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   psi;
 }
 
 chemistry       off;
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/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
index 40cf4f3f12..5aa51f0290 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   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
index 9efd80a3da..e7b9a3030f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
@@ -39,9 +39,9 @@ binaryAbsorptionEmissionCoeffs
         absorptionEmissionModel constantAbsorptionEmission;
         constantAbsorptionEmissionCoeffs
         {
-            a               a [ 0 -1 0 0 0 0 0 ] 0.5;
-            e               e [ 0 -1 0 0 0 0 0 ] 0.5;
-            E               E [ 1 -1 -3 0 0 0 0 ] 0;
+            absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.5;
+            emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.5;
+            E               E   [ 1 -1 -3 0 0 0 0 ] 0;
         }
     }
     model2
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/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
index 40cf4f3f12..5aa51f0290 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   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties
index 8759654027..ed229f3b23 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties
@@ -35,9 +35,9 @@ binaryAbsorptionEmissionCoeffs
         absorptionEmissionModel constantAbsorptionEmission;
         constantAbsorptionEmissionCoeffs
         {
-            a               a [ 0 -1 0 0 0 0 0 ] 0.5;
-            e               e [ 0 -1 0 0 0 0 0 ] 0.5;
-            E               E [ 1 -1 -3 0 0 0 0 ] 0;
+            absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.5;
+            emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.5;
+            E               E   [ 1 -1 -3 0 0 0 0 ] 0;
         }
     }
     model2
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/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
index 40cf4f3f12..5aa51f0290 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   rho;
 }
 
 chemistry       off;
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/chemistryProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
index fcf49a0f81..deb5491013 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   psi;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
index 059bfddd3c..f5b5e36cba 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
@@ -35,9 +35,9 @@ binaryAbsorptionEmissionCoeffs
         absorptionEmissionModel constantAbsorptionEmission;
         constantAbsorptionEmissionCoeffs
         {
-            a               a [ 0 -1 0 0 0 0 0 ] 0.5;
-            e               e [ 0 -1 0 0 0 0 0 ] 0.5;
-            E               E [ 1 -1 -3 0 0 0 0 ] 0;
+            absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.5;
+            emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.5;
+            E               E   [ 1 -1 -3 0 0 0 0 ] 0;
         }
     }
     model2
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;
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/blockMeshDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/blockMeshDict
index e87f696658..fedb6ff28a 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/blockMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/blockMeshDict
@@ -31,8 +31,8 @@ vertices
 
 blocks
 (
-//    hex (0 1 2 3 4 5 6 7) (20 60 60) simpleGrading (10.0 1 1)
-    hex (0 1 2 3 4 5 6 7) (6 6 6) simpleGrading (10.0 1 1)
+    hex (0 1 2 3 4 5 6 7) (20 60 60) simpleGrading (10.0 1 1)
+//    hex (0 1 2 3 4 5 6 7) (6 6 6) simpleGrading (10.0 1 1)
 );
 
 edges